Commit 9e979d64 authored by Laurent Vivier's avatar Laurent Vivier
Browse files

linux-user: move ppc socket.h definitions to ppc/sockbits.h 



Change conditional #ifdef part by #undef of the symbols
redefined for PPC relative to generic/socket.h

Signed-off-by: default avatarLaurent Vivier <laurent@vivier.eu>
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Message-Id: <20180519092956.15134-6-laurent@vivier.eu>
parent 500fa607

linux-user/generic/sockbits.h

+0 −9
Original line number Diff line number Diff line
@@ -30,21 +30,12 @@ 
#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

#define TARGET_SO_PASSCRED     16

#define TARGET_SO_PEERCRED     17

#define TARGET_SO_RCVLOWAT     18

#define TARGET_SO_SNDLOWAT     19

#define TARGET_SO_RCVTIMEO     20

#define TARGET_SO_SNDTIMEO     21

#endif



/* Security levels - as per NRL IPv6 - don't actually do anything */

#define TARGET_SO_SECURITY_AUTHENTICATION              22

linux-user/ppc/sockbits.h

+25 −0
Original line number Diff line number Diff line 
/*

 * 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



#include "../generic/sockbits.h"



#undef  TARGET_SO_RCVLOWAT

#define TARGET_SO_RCVLOWAT     16

#undef  TARGET_SO_SNDLOWAT

#define TARGET_SO_SNDLOWAT     17

#undef  TARGET_SO_RCVTIMEO

#define TARGET_SO_RCVTIMEO     18

#undef  TARGET_SO_SNDTIMEO

#define TARGET_SO_SNDTIMEO     19

#undef  TARGET_SO_PASSCRED

#define TARGET_SO_PASSCRED     20

#undef  TARGET_SO_PEERCRED

#define TARGET_SO_PEERCRED     21



#endif