diff options
Diffstat (limited to 'sysdeps/unix')
| -rw-r--r-- | sysdeps/unix/make-syscalls.sh | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/Makefile | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/abi-tag.h | 18 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/if_index.c | 1 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/netinet/tcp.h | 99 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sys/sysmacros.h | 17 |
6 files changed, 70 insertions, 71 deletions
diff --git a/sysdeps/unix/make-syscalls.sh b/sysdeps/unix/make-syscalls.sh index 93a73802f7..f00ce5bf37 100644 --- a/sysdeps/unix/make-syscalls.sh +++ b/sysdeps/unix/make-syscalls.sh @@ -57,7 +57,7 @@ EOF # Emit a compilation rule for this syscall. echo "\ -\$(foreach o,\$(all-object-suffixes),\$(objpfx)$file\$o): \\ +\$(foreach o,\$(object-suffixes),\$(objpfx)$file\$o): \\ \$(common-objpfx)s-proto.d (echo '#include <sysdep.h>'; \\ echo 'PSEUDO ($strong, $syscall, $nargs)'; \\ diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile index ea1ab49fd4..0545f4426a 100644 --- a/sysdeps/unix/sysv/linux/Makefile +++ b/sysdeps/unix/sysv/linux/Makefile @@ -4,6 +4,10 @@ CFLAGS-init-first.c = -fkeep-inline-functions sysdep_routines += errno-loc endif +ifeq ($(subdir),db2) +CPPFLAGS += -DHAVE_LLSEEK=1 +endif + ifeq ($(subdir),misc) sysdep_routines += sysctl clone llseek diff --git a/sysdeps/unix/sysv/linux/abi-tag.h b/sysdeps/unix/sysv/linux/abi-tag.h deleted file mode 100644 index 6c71eece85..0000000000 --- a/sysdeps/unix/sysv/linux/abi-tag.h +++ /dev/null @@ -1,18 +0,0 @@ -/* Define the GNU ABI tag for the Linux kernel we need. - The is a 4-byte quantity in native byte order: - the high byte is 0 to indicate Linux; - the low three bytes are the LINUX_VERSION_CODE for the earliest - compatible Linux kernel. */ - -#define ABI_LINUX_TAG 0 - -#define ABI_LINUX_MAJOR 2 -#define ABI_LINUX_MINOR 0 -#define ABI_LINUX_PATCH 0 - -/* Don't use `|' in this expression, it is a comment character in the - assembler. */ -#define ABI_TAG ((ABI_LINUX_TAG << 24) + \ - (ABI_LINUX_MAJOR << 16) + \ - (ABI_LINUX_MINOR << 8) + \ - (ABI_LINUX_PATCH << 0)) diff --git a/sysdeps/unix/sysv/linux/if_index.c b/sysdeps/unix/sysv/linux/if_index.c index 7d7fc02717..c0ffbcedf6 100644 --- a/sysdeps/unix/sysv/linux/if_index.c +++ b/sysdeps/unix/sysv/linux/if_index.c @@ -16,6 +16,7 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include <errno.h> #include <string.h> #include <stdio.h> #include <stdlib.h> diff --git a/sysdeps/unix/sysv/linux/netinet/tcp.h b/sysdeps/unix/sysv/linux/netinet/tcp.h index 60e67c5149..49fa180a00 100644 --- a/sysdeps/unix/sysv/linux/netinet/tcp.h +++ b/sysdeps/unix/sysv/linux/netinet/tcp.h @@ -36,78 +36,81 @@ #ifndef _NETINET_TCP_H #define _NETINET_TCP_H 1 -#include <sys/cdefs.h> +#include <features.h> #include <sys/types.h> __BEGIN_DECLS #ifdef __FAVOR_BSD -typedef u_int32_t tcp_seq; +typedef u_int32_t tcp_seq; /* * TCP header. * Per RFC 793, September, 1981. */ -struct tcphdr { - u_int16_t th_sport; /* source port */ - u_int16_t th_dport; /* destination port */ - tcp_seq th_seq; /* sequence number */ - tcp_seq th_ack; /* acknowledgement number */ +struct tcphdr + { + u_int16_t th_sport; /* source port */ + u_int16_t th_dport; /* destination port */ + tcp_seq th_seq; /* sequence number */ + tcp_seq th_ack; /* acknowledgement number */ #if __BYTE_ORDER == __LITTLE_ENDIAN - u_int8_t th_x2:4, /* (unused) */ - th_off:4; /* data offset */ + u_int8_t th_x2:4; /* (unused) */ + u_int8_t th_off:4; /* data offset */ #endif #if __BYTE_ORDER == __BIG_ENDIAN - u_int8_t th_off:4, /* data offset */ - th_x2:4; /* (unused) */ + u_int8_t th_off:4; /* data offset */ + u_int8_t th_x2:4; /* (unused) */ #endif - u_int8_t th_flags; + u_int8_t th_flags; #define TH_FIN 0x01 #define TH_SYN 0x02 #define TH_RST 0x04 #define TH_PUSH 0x08 #define TH_ACK 0x10 #define TH_URG 0x20 - u_int16_t th_win; /* window */ - u_int16_t th_sum; /* checksum */ - u_int16_t th_urp; /* urgent pointer */ + u_int16_t th_win; /* window */ + u_int16_t th_sum; /* checksum */ + u_int16_t th_urp; /* urgent pointer */ }; #else /* !__FAVOR_BSD */ -struct tcphdr { - u_int16_t source; - u_int16_t dest; - u_int32_t seq; - u_int32_t ack_seq; +struct tcphdr + { + u_int16_t source; + u_int16_t dest; + u_int32_t seq; + u_int32_t ack_seq; #if __BYTE_ORDER == __LITTLE_ENDIAN - u_int16_t res1:4, - doff:4, - fin:1, - syn:1, - rst:1, - psh:1, - ack:1, - urg:1, - res2:2; + u_int16_t res1:4; + u_int16_t doff:4; + u_int16_t fin:1; + u_int16_t syn:1; + u_int16_t rst:1; + u_int16_t psh:1; + u_int16_t ack:1; + u_int16_t urg:1; + u_int16_t res2:2; #elif __BYTE_ORDER == __BIG_ENDIAN - u_int16_t doff:4, - res1:4, - res2:2, - urg:1, - ack:1, - psh:1, - rst:1, - syn:1, - fin:1; + u_int16_t doff:4; + u_int16_t res1:4; + u_int16_t res2:2; + u_int16_t urg:1; + u_int16_t ack:1; + u_int16_t psh:1; + u_int16_t rst:1; + u_int16_t syn:1; + u_int16_t fin:1; #else #error "Adjust your <bits/endian.h> defines" -#endif - u_int16_t window; - u_int16_t check; - u_int16_t urg_ptr; +#endif + u_int16_t window; + u_int16_t check; + u_int16_t urg_ptr; }; #endif /* __FAVOR_BSD */ -enum { +enum +{ TCP_ESTABLISHED = 1, TCP_SYN_SENT, TCP_SYN_RECV, @@ -124,15 +127,15 @@ enum { #define TCPOPT_EOL 0 #define TCPOPT_NOP 1 #define TCPOPT_MAXSEG 2 -#define TCPOLEN_MAXSEG 4 +#define TCPOLEN_MAXSEG 4 #define TCPOPT_WINDOW 3 -#define TCPOLEN_WINDOW 3 +#define TCPOLEN_WINDOW 3 #define TCPOPT_SACK_PERMITTED 4 /* Experimental */ -#define TCPOLEN_SACK_PERMITTED 2 +#define TCPOLEN_SACK_PERMITTED 2 #define TCPOPT_SACK 5 /* Experimental */ #define TCPOPT_TIMESTAMP 8 -#define TCPOLEN_TIMESTAMP 10 -#define TCPOLEN_TSTAMP_APPA (TCPOLEN_TIMESTAMP+2) /* appendix A */ +#define TCPOLEN_TIMESTAMP 10 +#define TCPOLEN_TSTAMP_APPA (TCPOLEN_TIMESTAMP+2) /* appendix A */ #define TCPOPT_TSTAMP_HDR \ (TCPOPT_NOP<<24|TCPOPT_NOP<<16|TCPOPT_TIMESTAMP<<8|TCPOLEN_TIMESTAMP) diff --git a/sysdeps/unix/sysv/linux/sys/sysmacros.h b/sysdeps/unix/sysv/linux/sys/sysmacros.h index 5c1e1f7441..55486feb3e 100644 --- a/sysdeps/unix/sysv/linux/sys/sysmacros.h +++ b/sysdeps/unix/sysv/linux/sys/sysmacros.h @@ -21,9 +21,18 @@ #define _SYS_SYSMACROS_H 1 -/* For compatibility we provide alternative names. */ -#define major(dev) ((int)(((dev) >> 8) & 0xff)) -#define minor(dev) ((int)((dev) & 0xff)) -#define makedev(major, minor) (((major) << 8) | (minor)) +/* For compatibility we provide alternative names. + + The problem here is that compilers other than GCC probably don't + have the `long long' type and so `dev_t' is actually an array. */ +#if defined __GNUC__ && __GNUC__ >= 2 +# define major(dev) ((int)(((dev) >> 8) & 0xff)) +# define minor(dev) ((int)((dev) & 0xff)) +# define makedev(major, minor) (((major) << 8) | (minor)) +#else +# define major(dev) (((dev).__val[0] >> 8) & 0xff) +# define minor(dev) ((dev).__val[0] & 0xff) +# define makedev(major, minor) { (((major) << 8) | (minor)), 0 } +#endif #endif /* _SYS_SYSMACROS_H */ |