fix socket.h on mips

why does mips have to be gratuitously incompatible in every possible
imaginable way?

diff --git a/arch/mips/bits/socket.h b/arch/mips/bits/socket.h
index 36febbc2226b66b09f92ba3e51142e9738c139cc..3715ddd6844cc5ad7bff09c3c25aaa37a14dc8b5 100644 (file)
--- a/arch/mips/bits/socket.h
+++ b/arch/mips/bits/socket.h
@@ -15,3 +15,6 @@ struct cmsghdr
        int cmsg_level;
        int cmsg_type;
 };
+
+#define SOCK_STREAM    2
+#define SOCK_DGRAM     1

diff --git a/include/sys/socket.h b/include/sys/socket.h
index 88243ae5f189412a4a27b6b9d394a6156afd4c41..a384ca1258e5d82490ec4f1498f3e946affa06bc 100644 (file)
--- a/include/sys/socket.h
+++ b/include/sys/socket.h
@@ -34,8 +34,11 @@ struct linger
 #define SHUT_WD 1
 #define SHUT_RDWR 2
 
+#ifndef SOCK_STREAM
 #define SOCK_STREAM    1
 #define SOCK_DGRAM     2
+#endif
+
 #define SOCK_RAW       3
 #define SOCK_RDM       4
 #define SOCK_SEQPACKET 5