diff options
| -rw-r--r-- | arch/arm/bits/socket.h | 5 | ||||
| -rw-r--r-- | arch/i386/bits/socket.h | 5 | ||||
| -rw-r--r-- | arch/m68k/bits/socket.h | 5 | ||||
| -rw-r--r-- | arch/microblaze/bits/socket.h | 5 | ||||
| -rw-r--r-- | arch/mips/bits/socket.h | 5 | ||||
| -rw-r--r-- | arch/mipsn32/bits/socket.h | 5 | ||||
| -rw-r--r-- | arch/or1k/bits/socket.h | 5 | ||||
| -rw-r--r-- | arch/powerpc/bits/socket.h | 5 | ||||
| -rw-r--r-- | arch/sh/bits/socket.h | 5 | ||||
| -rw-r--r-- | include/sys/socket.h | 11 |
10 files changed, 11 insertions, 45 deletions
diff --git a/arch/arm/bits/socket.h b/arch/arm/bits/socket.h deleted file mode 100644 index 4d1f645b..00000000 --- a/arch/arm/bits/socket.h +++ /dev/null @@ -1,5 +0,0 @@ -#define SO_TIMESTAMP 63 -#define SO_TIMESTAMPNS 64 -#define SO_TIMESTAMPING 65 -#define SO_RCVTIMEO 66 -#define SO_SNDTIMEO 67 diff --git a/arch/i386/bits/socket.h b/arch/i386/bits/socket.h deleted file mode 100644 index 4d1f645b..00000000 --- a/arch/i386/bits/socket.h +++ /dev/null @@ -1,5 +0,0 @@ -#define SO_TIMESTAMP 63 -#define SO_TIMESTAMPNS 64 -#define SO_TIMESTAMPING 65 -#define SO_RCVTIMEO 66 -#define SO_SNDTIMEO 67 diff --git a/arch/m68k/bits/socket.h b/arch/m68k/bits/socket.h deleted file mode 100644 index 4d1f645b..00000000 --- a/arch/m68k/bits/socket.h +++ /dev/null @@ -1,5 +0,0 @@ -#define SO_TIMESTAMP 63 -#define SO_TIMESTAMPNS 64 -#define SO_TIMESTAMPING 65 -#define SO_RCVTIMEO 66 -#define SO_SNDTIMEO 67 diff --git a/arch/microblaze/bits/socket.h b/arch/microblaze/bits/socket.h deleted file mode 100644 index 4d1f645b..00000000 --- a/arch/microblaze/bits/socket.h +++ /dev/null @@ -1,5 +0,0 @@ -#define SO_TIMESTAMP 63 -#define SO_TIMESTAMPNS 64 -#define SO_TIMESTAMPING 65 -#define SO_RCVTIMEO 66 -#define SO_SNDTIMEO 67 diff --git a/arch/mips/bits/socket.h b/arch/mips/bits/socket.h index 4ffc4d4a..02fbb88b 100644 --- a/arch/mips/bits/socket.h +++ b/arch/mips/bits/socket.h @@ -21,11 +21,6 @@ #define SO_ACCEPTCONN 0x1009 #define SO_PROTOCOL 0x1028 #define SO_DOMAIN 0x1029 -#define SO_TIMESTAMP 63 -#define SO_TIMESTAMPNS 64 -#define SO_TIMESTAMPING 65 -#define SO_RCVTIMEO 66 -#define SO_SNDTIMEO 67 #define SO_NO_CHECK 11 #define SO_PRIORITY 12 diff --git a/arch/mipsn32/bits/socket.h b/arch/mipsn32/bits/socket.h index 4ffc4d4a..02fbb88b 100644 --- a/arch/mipsn32/bits/socket.h +++ b/arch/mipsn32/bits/socket.h @@ -21,11 +21,6 @@ #define SO_ACCEPTCONN 0x1009 #define SO_PROTOCOL 0x1028 #define SO_DOMAIN 0x1029 -#define SO_TIMESTAMP 63 -#define SO_TIMESTAMPNS 64 -#define SO_TIMESTAMPING 65 -#define SO_RCVTIMEO 66 -#define SO_SNDTIMEO 67 #define SO_NO_CHECK 11 #define SO_PRIORITY 12 diff --git a/arch/or1k/bits/socket.h b/arch/or1k/bits/socket.h deleted file mode 100644 index 4d1f645b..00000000 --- a/arch/or1k/bits/socket.h +++ /dev/null @@ -1,5 +0,0 @@ -#define SO_TIMESTAMP 63 -#define SO_TIMESTAMPNS 64 -#define SO_TIMESTAMPING 65 -#define SO_RCVTIMEO 66 -#define SO_SNDTIMEO 67 diff --git a/arch/powerpc/bits/socket.h b/arch/powerpc/bits/socket.h index e5fa0f7a..b19ed42b 100644 --- a/arch/powerpc/bits/socket.h +++ b/arch/powerpc/bits/socket.h @@ -23,8 +23,3 @@ #define SO_RCVBUFFORCE 33 #define SO_PROTOCOL 38 #define SO_DOMAIN 39 -#define SO_TIMESTAMP 63 -#define SO_TIMESTAMPNS 64 -#define SO_TIMESTAMPING 65 -#define SO_RCVTIMEO 66 -#define SO_SNDTIMEO 67 diff --git a/arch/sh/bits/socket.h b/arch/sh/bits/socket.h deleted file mode 100644 index 4d1f645b..00000000 --- a/arch/sh/bits/socket.h +++ /dev/null @@ -1,5 +0,0 @@ -#define SO_TIMESTAMP 63 -#define SO_TIMESTAMPNS 64 -#define SO_TIMESTAMPING 65 -#define SO_RCVTIMEO 66 -#define SO_SNDTIMEO 67 diff --git a/include/sys/socket.h b/include/sys/socket.h index 4ea7be1e..a1c0b01c 100644 --- a/include/sys/socket.h +++ b/include/sys/socket.h @@ -225,15 +225,26 @@ struct linger { #endif #ifndef SO_RCVTIMEO +#if __LONG_MAX == 0x7fffffff +#define SO_RCVTIMEO 66 +#define SO_SNDTIMEO 67 +#else #define SO_RCVTIMEO 20 #define SO_SNDTIMEO 21 #endif +#endif #ifndef SO_TIMESTAMP +#if __LONG_MAX == 0x7fffffff +#define SO_TIMESTAMP 63 +#define SO_TIMESTAMPNS 64 +#define SO_TIMESTAMPING 65 +#else #define SO_TIMESTAMP 29 #define SO_TIMESTAMPNS 35 #define SO_TIMESTAMPING 37 #endif +#endif #define SO_SECURITY_AUTHENTICATION 22 #define SO_SECURITY_ENCRYPTION_TRANSPORT 23 |