commit d75abb9614b04c3da3104099752726f9d1c6d8c7
author Greg Hackmann <ghackmann@google.com> Tue Aug 25 17:45:46 2015 -0700
committer Greg Hackmann <ghackmann@google.com> Fri Sep 18 13:37:53 2015 -0700
tree e3e64f1300f96712b7cedf4a61e1299a48486111
parent cd0ed2f174d9015da5ae7206bc4c5190cd0bb51e

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 <ghackmann@google.com>

libc/include/sys/socket.h

diff --git a/libc/include/sys/socket.h b/libc/include/sys/socket.h
index ff8a815..c0720b8 100644
--- a/libc/include/sys/socket.h
+++ b/libc/include/sys/socket.h
@@ -50,19 +50,15 @@
 #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