diff options
Diffstat (limited to 'sysdeps/unix/sysv')
| -rw-r--r-- | sysdeps/unix/sysv/linux/alpha/sys/kernel_termios.h | 7 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/net/if.h | 5 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/net/if_arp.h | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sparc/clone.S | 3 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sys/kernel_termios.h | 7 |
5 files changed, 22 insertions, 4 deletions
diff --git a/sysdeps/unix/sysv/linux/alpha/sys/kernel_termios.h b/sysdeps/unix/sysv/linux/alpha/sys/kernel_termios.h index eebe976ce1..4be759a51f 100644 --- a/sysdeps/unix/sysv/linux/alpha/sys/kernel_termios.h +++ b/sysdeps/unix/sysv/linux/alpha/sys/kernel_termios.h @@ -1,5 +1,10 @@ +#ifndef _SYS_KERNEL_TERMIOS_H +#define _SYS_KERNEL_TERMIOS_H 1 /* The following corresponds to the values from the Linux 2.1.20 kernel. */ +/* We need the definition of tcflag_t, cc_t, and speed_t. */ +#include <termbits.h> + #define __KERNEL_NCCS 19 struct __kernel_termios @@ -16,3 +21,5 @@ struct __kernel_termios #define _HAVE_C_ISPEED 1 #define _HAVE_C_OSPEED 1 + +#endif /* sys/kernel_termios.h */ diff --git a/sysdeps/unix/sysv/linux/net/if.h b/sysdeps/unix/sysv/linux/net/if.h index bf261175ec..db86d20f23 100644 --- a/sysdeps/unix/sysv/linux/net/if.h +++ b/sysdeps/unix/sysv/linux/net/if.h @@ -105,7 +105,7 @@ struct ifreq struct sockaddr ifru_netmask; struct sockaddr ifru_hwaddr; short int ifru_flags; - int ifru_metric; + int ifru_ivalue; int ifru_mtu; struct ifmap ifru_map; char ifru_slave[IFNAMSIZ]; /* Just fits the size */ @@ -120,11 +120,12 @@ struct ifreq #define ifr_broadaddr ifr_ifru.ifru_broadaddr /* broadcast address */ #define ifr_netmask ifr_ifru.ifru_netmask /* interface net mask */ #define ifr_flags ifr_ifru.ifru_flags /* flags */ -#define ifr_metric ifr_ifru.ifru_metric /* metric */ +#define ifr_metric ifr_ifru.ifru_ivalue /* metric */ #define ifr_mtu ifr_ifru.ifru_mtu /* mtu */ #define ifr_map ifr_ifru.ifru_map /* device map */ #define ifr_slave ifr_ifru.ifru_slave /* slave device */ #define ifr_data ifr_ifru.ifru_data /* for use by interface */ +#define ifr_ifindex ifr_ifru.ifru_ivalue /* interface index */ /* Structure used in SIOCGIFCONF request. Used to retrieve interface diff --git a/sysdeps/unix/sysv/linux/net/if_arp.h b/sysdeps/unix/sysv/linux/net/if_arp.h index ae0e799fb6..cf48f10f79 100644 --- a/sysdeps/unix/sysv/linux/net/if_arp.h +++ b/sysdeps/unix/sysv/linux/net/if_arp.h @@ -29,6 +29,10 @@ __BEGIN_DECLS +/* Some internals from deep down in the kernel. */ +#define MAX_ADDR_LEN 7 + + /* This structure defines an ethernet arp header. */ /* ARP protocol opcodes. */ diff --git a/sysdeps/unix/sysv/linux/sparc/clone.S b/sysdeps/unix/sysv/linux/sparc/clone.S index 9e1ba812b0..64735e9dbc 100644 --- a/sysdeps/unix/sysv/linux/sparc/clone.S +++ b/sysdeps/unix/sysv/linux/sparc/clone.S @@ -1,6 +1,5 @@ /* Copyright (C) 1996, 1997 Free Software Foundation, Inc. - Contributed by Miguel de Icaza (miguel@nuclecu.unam.mx) - Based on code written for the Intel by Richard Henderson (rth@tamu.edu). + Contributed by Richard Henderson (rth@tamu.edu). The GNU C Library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as diff --git a/sysdeps/unix/sysv/linux/sys/kernel_termios.h b/sysdeps/unix/sysv/linux/sys/kernel_termios.h index 95349760f0..629508e765 100644 --- a/sysdeps/unix/sysv/linux/sys/kernel_termios.h +++ b/sysdeps/unix/sysv/linux/sys/kernel_termios.h @@ -1,5 +1,10 @@ +#ifndef _SYS_KERNEL_TERMIOS_H +#define _SYS_KERNEL_TERMIOS_H 1 /* The following corresponds to the values from the Linux 2.1.20 kernel. */ +/* We need the definition of tcflag_t, cc_t, and speed_t. */ +#include <termbits.h> + #define __KERNEL_NCCS 19 struct __kernel_termios @@ -11,3 +16,5 @@ struct __kernel_termios cc_t c_line; /* line discipline */ cc_t c_cc[__KERNEL_NCCS]; /* control characters */ }; + +#endif /* sys/kernel_termios.h */ |