From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52611) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJ3TP-0000AY-MT for qemu-devel@nongnu.org; Wed, 16 May 2018 16:56:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fJ3TM-00040O-Lm for qemu-devel@nongnu.org; Wed, 16 May 2018 16:56:35 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:32933) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fJ3TM-0003zF-Ci for qemu-devel@nongnu.org; Wed, 16 May 2018 16:56:32 -0400 From: Laurent Vivier Date: Wed, 16 May 2018 22:55:40 +0200 Message-Id: <20180516205543.29305-6-laurent@vivier.eu> In-Reply-To: <20180516205543.29305-1-laurent@vivier.eu> References: <20180516205543.29305-1-laurent@vivier.eu> Subject: [Qemu-devel] [PATCH v2 5/8] linux-user: move ppc socket.h definitions to ppc/sockbits.h List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Riku Voipio , Laurent Vivier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Yongbok Kim , Mark Cave-Ayland No code change. Signed-off-by: Laurent Vivier --- linux-user/generic/sockbits.h | 9 +-------- linux-user/ppc/sockbits.h | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/linux-user/generic/sockbits.h b/linux-user/generic/sockbits.h index 093faf0a48..5ad43eb0c8 100644 --- a/linux-user/generic/sockbits.h +++ b/linux-user/generic/sockbits.h @@ -30,14 +30,7 @@ #define TARGET_SO_LINGER 13 #define TARGET_SO_BSDCOMPAT 14 /* To add :#define TARGET_SO_REUSEPORT 15 */ -#if defined(TARGET_PPC) -#define TARGET_SO_RCVLOWAT 16 -#define TARGET_SO_SNDLOWAT 17 -#define TARGET_SO_RCVTIMEO 18 -#define TARGET_SO_SNDTIMEO 19 -#define TARGET_SO_PASSCRED 20 -#define TARGET_SO_PEERCRED 21 -#else +#ifndef TARGET_SO_PASSCRED /* powerpc only differs in these */ #define TARGET_SO_PASSCRED 16 #define TARGET_SO_PEERCRED 17 #define TARGET_SO_RCVLOWAT 18 diff --git a/linux-user/ppc/sockbits.h b/linux-user/ppc/sockbits.h index 0e4c8f012d..3593bc44ac 100644 --- a/linux-user/ppc/sockbits.h +++ b/linux-user/ppc/sockbits.h @@ -1 +1,20 @@ +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation, or (at your option) any + * later version. See the COPYING file in the top-level directory. + */ + +#ifndef PPC_SOCKBITS_H +#define PPC_SOCKBITS_H + +#define TARGET_SO_RCVLOWAT 16 +#define TARGET_SO_SNDLOWAT 17 +#define TARGET_SO_RCVTIMEO 18 +#define TARGET_SO_SNDTIMEO 19 +#define TARGET_SO_PASSCRED 20 +#define TARGET_SO_PEERCRED 21 + #include "../generic/sockbits.h" + +#endif -- 2.14.3