about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2012-08-05 14:23:40 -0400
committerRich Felker <dalias@aerifal.cx>2012-08-05 14:23:40 -0400
commit7fee5f96063ffd55ba67a87a795222c30364e25f (patch)
tree5efaf63c8150698a72c50d69696562335353af8f
parent32e7bd78ae3b290f28ada2b3d58460068ce08781 (diff)
downloadmusl-7fee5f96063ffd55ba67a87a795222c30364e25f.tar.gz
musl-7fee5f96063ffd55ba67a87a795222c30364e25f.tar.xz
musl-7fee5f96063ffd55ba67a87a795222c30364e25f.zip
fix socket.h on mips
why does mips have to be gratuitously incompatible in every possible
imaginable way?
-rw-r--r--arch/mips/bits/socket.h3
-rw-r--r--include/sys/socket.h3
2 files changed, 6 insertions, 0 deletions
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