From d75abb9614b04c3da3104099752726f9d1c6d8c7 Mon Sep 17 00:00:00 2001 From: Greg Hackmann Date: Tue, 25 Aug 2015 17:45:46 -0700 Subject: [PATCH] Fix SOCK_* flag definitions MIPS and the rest of the world only disagree on the first two SOCK_* constants, so restructure the #ifdef accordingly. As a deliberate side effect, this fixes SOCK_DCCP being missing on non-MIPS platforms. Change-Id: I2267008f1121a7eebe1ed9097afab6e612bce7f0 Signed-off-by: Greg Hackmann --- libc/include/sys/socket.h | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/libc/include/sys/socket.h b/libc/include/sys/socket.h index ff8a815df..c0720b836 100644 --- a/libc/include/sys/socket.h +++ b/libc/include/sys/socket.h @@ -50,19 +50,15 @@ struct timespec; #ifdef __mips__ #define SOCK_DGRAM 1 #define SOCK_STREAM 2 +#else +#define SOCK_STREAM 1 +#define SOCK_DGRAM 2 +#endif #define SOCK_RAW 3 #define SOCK_RDM 4 #define SOCK_SEQPACKET 5 #define SOCK_DCCP 6 #define SOCK_PACKET 10 -#else -#define SOCK_STREAM 1 -#define SOCK_DGRAM 2 -#define SOCK_RAW 3 -#define SOCK_RDM 4 -#define SOCK_SEQPACKET 5 -#define SOCK_PACKET 10 -#endif #define SOCK_CLOEXEC O_CLOEXEC #define SOCK_NONBLOCK O_NONBLOCK -- 2.11.0