diff --git a/Lib/plat-linux2/IN.py b/Lib/plat-linux2/IN.py
index d97b132..c63c15e 100644
--- a/Lib/plat-linux2/IN.py
+++ b/Lib/plat-linux2/IN.py
@@ -94,34 +94,46 @@
 INT8_MIN = (-128)
 INT16_MIN = (-32767-1)
 INT32_MIN = (-2147483647-1)
+INT64_MIN = (-__INT64_C(9223372036854775807)-1)
 INT8_MAX = (127)
 INT16_MAX = (32767)
 INT32_MAX = (2147483647)
+INT64_MAX = (__INT64_C(9223372036854775807))
 UINT8_MAX = (255)
 UINT16_MAX = (65535)
+UINT64_MAX = (__UINT64_C(18446744073709551615))
 INT_LEAST8_MIN = (-128)
 INT_LEAST16_MIN = (-32767-1)
 INT_LEAST32_MIN = (-2147483647-1)
+INT_LEAST64_MIN = (-__INT64_C(9223372036854775807)-1)
 INT_LEAST8_MAX = (127)
 INT_LEAST16_MAX = (32767)
 INT_LEAST32_MAX = (2147483647)
+INT_LEAST64_MAX = (__INT64_C(9223372036854775807))
 UINT_LEAST8_MAX = (255)
 UINT_LEAST16_MAX = (65535)
+UINT_LEAST64_MAX = (__UINT64_C(18446744073709551615))
 INT_FAST8_MIN = (-128)
 INT_FAST16_MIN = (-9223372036854775807L-1)
 INT_FAST32_MIN = (-9223372036854775807L-1)
 INT_FAST16_MIN = (-2147483647-1)
 INT_FAST32_MIN = (-2147483647-1)
+INT_FAST64_MIN = (-__INT64_C(9223372036854775807)-1)
 INT_FAST8_MAX = (127)
 INT_FAST16_MAX = (9223372036854775807L)
 INT_FAST32_MAX = (9223372036854775807L)
 INT_FAST16_MAX = (2147483647)
 INT_FAST32_MAX = (2147483647)
+INT_FAST64_MAX = (__INT64_C(9223372036854775807))
 UINT_FAST8_MAX = (255)
+UINT_FAST64_MAX = (__UINT64_C(18446744073709551615))
 INTPTR_MIN = (-9223372036854775807L-1)
 INTPTR_MAX = (9223372036854775807L)
 INTPTR_MIN = (-2147483647-1)
 INTPTR_MAX = (2147483647)
+INTMAX_MIN = (-__INT64_C(9223372036854775807)-1)
+INTMAX_MAX = (__INT64_C(9223372036854775807))
+UINTMAX_MAX = (__UINT64_C(18446744073709551615))
 PTRDIFF_MIN = (-9223372036854775807L-1)
 PTRDIFF_MAX = (9223372036854775807L)
 PTRDIFF_MIN = (-2147483647-1)
@@ -179,30 +191,30 @@
 CLONE_PTRACE = 0x00002000
 CLONE_VFORK = 0x00004000
 __defined_schedparam = 1
-def IN_CLASSA(a): return ((((in_addr_t)(a)) & 0x80000000) == 0)
+def IN_CLASSA(a): return ((((in_addr_t)(a)) & (-2147483648)) == 0)
 
-IN_CLASSA_NET = 0xff000000
+IN_CLASSA_NET = (-16777216)
 IN_CLASSA_NSHIFT = 24
-IN_CLASSA_HOST = (0xffffffff & ~IN_CLASSA_NET)
+IN_CLASSA_HOST = ((-1) & ~IN_CLASSA_NET)
 IN_CLASSA_MAX = 128
-def IN_CLASSB(a): return ((((in_addr_t)(a)) & 0xc0000000) == 0x80000000)
+def IN_CLASSB(a): return ((((in_addr_t)(a)) & (-1073741824)) == (-2147483648))
 
-IN_CLASSB_NET = 0xffff0000
+IN_CLASSB_NET = (-65536)
 IN_CLASSB_NSHIFT = 16
-IN_CLASSB_HOST = (0xffffffff & ~IN_CLASSB_NET)
+IN_CLASSB_HOST = ((-1) & ~IN_CLASSB_NET)
 IN_CLASSB_MAX = 65536
-def IN_CLASSC(a): return ((((in_addr_t)(a)) & 0xe0000000) == 0xc0000000)
+def IN_CLASSC(a): return ((((in_addr_t)(a)) & (-536870912)) == (-1073741824))
 
-IN_CLASSC_NET = 0xffffff00
+IN_CLASSC_NET = (-256)
 IN_CLASSC_NSHIFT = 8
-IN_CLASSC_HOST = (0xffffffff & ~IN_CLASSC_NET)
-def IN_CLASSD(a): return ((((in_addr_t)(a)) & 0xf0000000) == 0xe0000000)
+IN_CLASSC_HOST = ((-1) & ~IN_CLASSC_NET)
+def IN_CLASSD(a): return ((((in_addr_t)(a)) & (-268435456)) == (-536870912))
 
 def IN_MULTICAST(a): return IN_CLASSD(a)
 
-def IN_EXPERIMENTAL(a): return ((((in_addr_t)(a)) & 0xe0000000) == 0xe0000000)
+def IN_EXPERIMENTAL(a): return ((((in_addr_t)(a)) & (-536870912)) == (-536870912))
 
-def IN_BADCLASS(a): return ((((in_addr_t)(a)) & 0xf0000000) == 0xf0000000)
+def IN_BADCLASS(a): return ((((in_addr_t)(a)) & (-268435456)) == (-268435456))
 
 IN_LOOPBACKNET = 127
 INET_ADDRSTRLEN = 16
@@ -275,7 +287,7 @@
 MAX_CANON = 255
 MAX_INPUT = 255
 NAME_MAX = 255
-PATH_MAX = 4095
+PATH_MAX = 4096
 PIPE_BUF = 4096
 RTSIG_MAX = 32
 _POSIX_THREAD_KEYS_MAX = 128
@@ -287,7 +299,7 @@
 AIO_PRIO_DELTA_MAX = 20
 PTHREAD_STACK_MIN = 16384
 TIMER_MAX = 256
-SSIZE_MAX = INT_MAX
+SSIZE_MAX = LONG_MAX
 NGROUPS_MAX = _POSIX_NGROUPS_MAX
 
 # Included from bits/posix2_lim.h
@@ -317,7 +329,7 @@
 # Included from bits/stdio_lim.h
 L_tmpnam = 20
 TMP_MAX = 238328
-FILENAME_MAX = 4095
+FILENAME_MAX = 4096
 L_ctermid = 9
 L_cuserid = 9
 FOPEN_MAX = 16
@@ -545,6 +557,7 @@
 BYTE_ORDER = __BYTE_ORDER
 
 # Included from bits/byteswap.h
+_BITS_BYTESWAP_H = 1
 def __bswap_constant_16(x): return \
 
 def __bswap_16(x): return \