From: Rich Felker <dalias@aerifal.cx>
Date: Sun, 5 Aug 2012 18:23:40 +0000 (-0400)
Subject: fix socket.h on mips
X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=commitdiff_plain;h=7fee5f96063ffd55ba67a87a795222c30364e25f;ds=sidebyside

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 36febbc2..3715ddd6 100644
--- 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 88243ae5..a384ca12 100644
--- 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