From f1730f62f58349751e050c7413de00c45ad9c63c Mon Sep 17 00:00:00 2001
From: Waldemar Kornewald <wkornew@nowhere.fake>
Date: Sun, 18 Apr 2004 12:46:10 +0000
Subject: [PATCH] Fixed collision between SO_XXX and IP_XXX defines.

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@7227 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 headers/posix/netinet/ip_var.h | 10 ++++----
 headers/posix/sys/socket.h     | 44 ++++++++++++++++++----------------
 2 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/headers/posix/netinet/ip_var.h b/headers/posix/netinet/ip_var.h
index 23cd6cfa9b..57ee3a1c5e 100644
--- a/headers/posix/netinet/ip_var.h
+++ b/headers/posix/netinet/ip_var.h
@@ -140,11 +140,11 @@ struct  ipstat {
 
 //#ifdef _KERNEL_MODE
 
-#define IP_FORWARDING           0x1             /* most of ip header exists */
-#define IP_RAWOUTPUT            0x2             /* raw ip header exists */
-#define IP_ROUTETOIF            SO_DONTROUTE    /* bypass routing tables */
-#define IP_ALLOWBROADCAST       SO_BROADCAST    /* can send broadcast packets */
-#define IP_MTUDISC              0x0400          /* pmtu discovery, set DF */
+#define IP_FORWARDING			0x1				/* most of ip header exists */
+#define IP_ALLOWBROADCAST		SO_BROADCAST	/* can send broadcast packets */
+#define IP_RAWOUTPUT			0x4				/* raw ip header exists */
+#define IP_ROUTETOIF			SO_DONTROUTE	/* bypass routing tables */
+#define IP_MTUDISC				0x10			/* pmtu discovery, set DF */
 
 #if 0
 //struct ipstat ipstat;
diff --git a/headers/posix/sys/socket.h b/headers/posix/sys/socket.h
index dfaf69840a..2e96d76034 100644
--- a/headers/posix/sys/socket.h
+++ b/headers/posix/sys/socket.h
@@ -69,7 +69,7 @@ typedef uint32_t socklen_t;
 #define	SO_DEBUG		0x00000004	/* turn on debugging info recording */
 #define	SO_DONTROUTE	0x00000008	/* just use interface addresses */
 #define	SO_KEEPALIVE	0x00000010	/* keep connections alive */
-#define SO_OOBINLINE    0x00000020	/* leave received OOB data in line */
+#define SO_OOBINLINE	0x00000020	/* leave received OOB data in line */
 #define	SO_REUSEADDR	0x00000040	/* allow local address reuse */
 #define SO_REUSEPORT	0x00000080	/* allow local address & port reuse */
 #define SO_USELOOPBACK	0x00000100	/* bypass hardware when possible */
@@ -92,20 +92,24 @@ typedef uint32_t socklen_t;
 #define SO_BINDTODEVICE	0x4000000a
 
 /* only defined in OpenBeOS */
-#define SO_NETPROC      0x00001020	/* multiplex; network processing */
+#define SO_NETPROC		0x00001020	/* multiplex; network processing */
 
 /*
  * These are the valid values for the "how" field used by shutdown(2).
  */
 #ifndef BUILDING_R5_LIBNET
-#define SHUTDOWN_RECV	0
-#define SHUTDOWN_SEND	1
-#define SHUTDOWN_BOTH	2
-#else // BUILDING_R5_LIBNET
-#define SHUT_RD         1
-#define SHUT_WR         2
-#define SHUT_RDWR       3
-#endif // BUILDING_R5_LIBNET
+#define SHUT_RD			0
+#define SHUT_WR			1
+#define SHUT_RDWR		2
+/* for BONE compatibility */
+#define SHUTDOWN_RECV	SHUT_RD
+#define SHUTDOWN_SEND	SHUT_WR
+#define SHUTDOWN_BOTH	SHUT_RDWR
+#else /* BUILDING_R5_LIBNET */
+#define SHUT_RD			1
+#define SHUT_WR			2
+#define SHUT_RDWR		3
+#endif /* BUILDING_R5_LIBNET */
 
 
 struct linger {
@@ -203,16 +207,16 @@ struct msghdr {
 };
 
 /* Defines used in msghdr structure. */
-#define MSG_OOB         0x1             /* process out-of-band data */
-#define MSG_PEEK        0x2             /* peek at incoming message */
-#define MSG_DONTROUTE   0x4             /* send without using routing tables */
-#define MSG_EOR         0x8             /* data completes record */
-#define MSG_TRUNC       0x10            /* data discarded before delivery */
-#define MSG_CTRUNC      0x20            /* control data lost before delivery */
-#define MSG_WAITALL     0x40            /* wait for full request or error */
-#define MSG_DONTWAIT    0x80            /* this message should be nonblocking */
-#define MSG_BCAST       0x100           /* this message rec'd as broadcast */
-#define MSG_MCAST       0x200           /* this message rec'd as multicast */
+#define MSG_OOB			0x1				/* process out-of-band data */
+#define MSG_PEEK		0x2				/* peek at incoming message */
+#define MSG_DONTROUTE	0x4				/* send without using routing tables */
+#define MSG_EOR			0x8				/* data completes record */
+#define MSG_TRUNC		0x10			/* data discarded before delivery */
+#define MSG_CTRUNC		0x20			/* control data lost before delivery */
+#define MSG_WAITALL		0x40			/* wait for full request or error */
+#define MSG_DONTWAIT	0x80			/* this message should be nonblocking */
+#define MSG_BCAST		0x100			/* this message rec'd as broadcast */
+#define MSG_MCAST		0x200			/* this message rec'd as multicast */
 /* not defind in OpenBeOS */
 #define	MSG_EOF			0x400			/* data completes connection */