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
+3 -3
View File
@@ -141,10 +141,10 @@ 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_ROUTETOIF SO_DONTROUTE /* bypass routing tables */
#define IP_ALLOWBROADCAST SO_BROADCAST /* can send broadcast packets */ #define IP_ALLOWBROADCAST SO_BROADCAST /* can send broadcast packets */
#define IP_MTUDISC 0x0400 /* pmtu discovery, set DF */ #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 #if 0
//struct ipstat ipstat; //struct ipstat ipstat;
headers/posix/sys/socket.h
+9 -5
View File
@@ -98,14 +98,18 @@ typedef uint32_t socklen_t;
* 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 SHUTDOWN_RECV SHUT_RD
#define SHUTDOWN_SEND SHUT_WR
#define SHUTDOWN_BOTH SHUT_RDWR
#else /* BUILDING_R5_LIBNET */
#define SHUT_RD 1 #define SHUT_RD 1
#define SHUT_WR 2 #define SHUT_WR 2
#define SHUT_RDWR 3 #define SHUT_RDWR 3
#endif // BUILDING_R5_LIBNET #endif /* BUILDING_R5_LIBNET */
struct linger { struct linger {