i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed collision between SO_XXX and IP_XXX defines.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@7227 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Waldemar Kornewald
2004-04-18 12:46:10 +00:00
parent 58a1abc4d6
commit f1730f62f5
2 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/posix/netinet/ip_var.h
+5 -5
View File
@@ -140,11 +140,11 @@ struct ipstat {
//#ifdef _KERNEL_MODE //#ifdef _KERNEL_MODE
#define IP_FORWARDING 0x1 /* most of ip header exists */ #define IP_FORWARDING 0x1 /* most of ip header exists */
#define IP_RAWOUTPUT 0x2 /* raw ip header exists */ #define IP_ALLOWBROADCAST SO_BROADCAST /* can send broadcast packets */
#define IP_ROUTETOIF SO_DONTROUTE /* bypass routing tables */ #define IP_RAWOUTPUT 0x4 /* raw ip header exists */
#define IP_ALLOWBROADCAST SO_BROADCAST /* can send broadcast packets */ #define IP_ROUTETOIF SO_DONTROUTE /* bypass routing tables */
#define IP_MTUDISC 0x0400 /* pmtu discovery, set DF */ #define IP_MTUDISC 0x10 /* pmtu discovery, set DF */
#if 0 #if 0
//struct ipstat ipstat; //struct ipstat ipstat;
headers/posix/sys/socket.h
+24 -20
View File
@@ -69,7 +69,7 @@ typedef uint32_t socklen_t;
#define SO_DEBUG 0x00000004 /* turn on debugging info recording */ #define SO_DEBUG 0x00000004 /* turn on debugging info recording */
#define SO_DONTROUTE 0x00000008 /* just use interface addresses */ #define SO_DONTROUTE 0x00000008 /* just use interface addresses */
#define SO_KEEPALIVE 0x00000010 /* keep connections alive */ #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_REUSEADDR 0x00000040 /* allow local address reuse */
#define SO_REUSEPORT 0x00000080 /* allow local address & port reuse */ #define SO_REUSEPORT 0x00000080 /* allow local address & port reuse */
#define SO_USELOOPBACK 0x00000100 /* bypass hardware when possible */ #define SO_USELOOPBACK 0x00000100 /* bypass hardware when possible */
@@ -92,20 +92,24 @@ typedef uint32_t socklen_t;
#define SO_BINDTODEVICE 0x4000000a #define SO_BINDTODEVICE 0x4000000a
/* only defined in OpenBeOS */ /* 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). * These are the valid values for the "how" field used by shutdown(2).
*/ */
#ifndef BUILDING_R5_LIBNET #ifndef BUILDING_R5_LIBNET
#define SHUTDOWN_RECV 0 #define SHUT_RD 0
#define SHUTDOWN_SEND 1 #define SHUT_WR 1
#define SHUTDOWN_BOTH 2 #define SHUT_RDWR 2
#else // BUILDING_R5_LIBNET /* for BONE compatibility */
#define SHUT_RD 1 #define SHUTDOWN_RECV SHUT_RD
#define SHUT_WR 2 #define SHUTDOWN_SEND SHUT_WR
#define SHUT_RDWR 3 #define SHUTDOWN_BOTH SHUT_RDWR
#endif // BUILDING_R5_LIBNET #else /* BUILDING_R5_LIBNET */
#define SHUT_RD 1
#define SHUT_WR 2
#define SHUT_RDWR 3
#endif /* BUILDING_R5_LIBNET */
struct linger { struct linger {
@@ -203,16 +207,16 @@ struct msghdr {
}; };
/* Defines used in msghdr structure. */ /* Defines used in msghdr structure. */
#define MSG_OOB 0x1 /* process out-of-band data */ #define MSG_OOB 0x1 /* process out-of-band data */
#define MSG_PEEK 0x2 /* peek at incoming message */ #define MSG_PEEK 0x2 /* peek at incoming message */
#define MSG_DONTROUTE 0x4 /* send without using routing tables */ #define MSG_DONTROUTE 0x4 /* send without using routing tables */
#define MSG_EOR 0x8 /* data completes record */ #define MSG_EOR 0x8 /* data completes record */
#define MSG_TRUNC 0x10 /* data discarded before delivery */ #define MSG_TRUNC 0x10 /* data discarded before delivery */
#define MSG_CTRUNC 0x20 /* control data lost before delivery */ #define MSG_CTRUNC 0x20 /* control data lost before delivery */
#define MSG_WAITALL 0x40 /* wait for full request or error */ #define MSG_WAITALL 0x40 /* wait for full request or error */
#define MSG_DONTWAIT 0x80 /* this message should be nonblocking */ #define MSG_DONTWAIT 0x80 /* this message should be nonblocking */
#define MSG_BCAST 0x100 /* this message rec'd as broadcast */ #define MSG_BCAST 0x100 /* this message rec'd as broadcast */
#define MSG_MCAST 0x200 /* this message rec'd as multicast */ #define MSG_MCAST 0x200 /* this message rec'd as multicast */
/* not defind in OpenBeOS */ /* not defind in OpenBeOS */
#define MSG_EOF 0x400 /* data completes connection */ #define MSG_EOF 0x400 /* data completes connection */