diff options
author | Andreas Jaeger <aj@suse.de> | 2001-07-05 08:46:28 +0000 |
---|---|---|
committer | Andreas Jaeger <aj@suse.de> | 2001-07-05 08:46:28 +0000 |
commit | b3339de1d1178110f9abb0c831fa238d454eea84 (patch) | |
tree | 5a22456f42bdac6e8c59fdfe6e039f834a035bf3 /sysdeps | |
parent | * hurd/hurdsig.c (_hurd_internal_post_signal): For SS->suspended (diff) | |
download | glibc-b3339de1d1178110f9abb0c831fa238d454eea84.tar.gz glibc-b3339de1d1178110f9abb0c831fa238d454eea84.tar.bz2 glibc-b3339de1d1178110f9abb0c831fa238d454eea84.zip |
Synch with Linux 2.4.5:
* sysdeps/unix/sysv/linux/sparc/bits/socket.h (PF_BLUETOOTH):
New.
(AF_BLUETOOTH): New.
* sysdeps/unix/sysv/linux/s390/s390-64/bits/socket.h
(PF_BLUETOOTH): New.
(AF_BLUETOOTH): New.
* sysdeps/unix/sysv/linux/mips/bits/socket.h (AF_BLUETOOTH): New.
(PF_BLUETOOTH): New.
* sysdeps/unix/sysv/linux/ia64/bits/socket.h (AF_BLUETOOTH): New.
(PF_BLUETOOTH): New.
* sysdeps/unix/sysv/linux/alpha/bits/socket.h (PF_BLUETOOTH): New.
(AF_BLUETOOTH): New.
* sysdeps/unix/sysv/linux/bits/socket.h (PF_BLUETOOTH): New.
(AF_BLUETOOTH): New.
* sysdeps/unix/sysv/linux/net/if_arp.h (ARPHRD_IEEE80211): New.
* sysdeps/unix/sysv/linux/powerpc/bits/termios.h (N_HCI): New.
* sysdeps/unix/sysv/linux/mips/bits/ioctl-types.h (N_HCI): New.
* sysdeps/unix/sysv/linux/bits/ioctl-types.h (N_HCI): New.
Diffstat (limited to 'sysdeps')
-rw-r--r-- | sysdeps/unix/sysv/linux/alpha/bits/socket.h | 2 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/bits/ioctl-types.h | 3 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/bits/socket.h | 2 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/ia64/bits/socket.h | 2 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/mips/bits/ioctl-types.h | 3 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/mips/bits/socket.h | 2 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/net/if_arp.h | 2 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/powerpc/bits/termios.h | 11 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/s390/s390-64/bits/socket.h | 2 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/sparc/bits/socket.h | 2 |
10 files changed, 23 insertions, 8 deletions
diff --git a/sysdeps/unix/sysv/linux/alpha/bits/socket.h b/sysdeps/unix/sysv/linux/alpha/bits/socket.h index cf8e5a1b0a..a5c7e95d3c 100644 --- a/sysdeps/unix/sysv/linux/alpha/bits/socket.h +++ b/sysdeps/unix/sysv/linux/alpha/bits/socket.h @@ -88,6 +88,7 @@ enum __socket_type #define PF_IRDA 23 /* IRDA sockets. */ #define PF_PPPOX 24 /* PPPoX sockets. */ #define PF_WANPIPE 25 /* Wanpipe API sockets. */ +#define PF_BLUETOOTH 31 /* Bluetooth sockets. */ #define PF_MAX 32 /* For now.. */ /* Address families. */ @@ -119,6 +120,7 @@ enum __socket_type #define AF_IRDA PF_IRDA #define AF_PPPOX PF_PPPOX #define AF_WANPIPE PF_WANPIPE +#define AF_BLUETOOTH PF_BLUETOOTH #define AF_MAX PF_MAX /* Socket level values. Others are defined in the appropriate headers. diff --git a/sysdeps/unix/sysv/linux/bits/ioctl-types.h b/sysdeps/unix/sysv/linux/bits/ioctl-types.h index 59c79df812..45d3ba2ca6 100644 --- a/sysdeps/unix/sysv/linux/bits/ioctl-types.h +++ b/sysdeps/unix/sysv/linux/bits/ioctl-types.h @@ -1,5 +1,5 @@ /* Structure types for pre-termios terminal ioctls. Linux version. - Copyright (C) 1996, 1997, 1999 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1999, 2001 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -75,3 +75,4 @@ struct termio #define N_SMSBLOCK 12 /* SMS block mode */ #define N_HDLC 13 /* synchronous HDLC */ #define N_SYNC_PPP 14 /* synchronous PPP */ +#define N_HCI 15 /* Bluetooth HCI UART */ diff --git a/sysdeps/unix/sysv/linux/bits/socket.h b/sysdeps/unix/sysv/linux/bits/socket.h index c7a509a920..7d090559b9 100644 --- a/sysdeps/unix/sysv/linux/bits/socket.h +++ b/sysdeps/unix/sysv/linux/bits/socket.h @@ -88,6 +88,7 @@ enum __socket_type #define PF_IRDA 23 /* IRDA sockets. */ #define PF_PPPOX 24 /* PPPoX sockets. */ #define PF_WANPIPE 25 /* Wanpipe API sockets. */ +#define PF_BLUETOOTH 31 /* Bluetooth sockets. */ #define PF_MAX 32 /* For now.. */ /* Address families. */ @@ -119,6 +120,7 @@ enum __socket_type #define AF_IRDA PF_IRDA #define AF_PPPOX PF_PPPOX #define AF_WANPIPE PF_WANPIPE +#define AF_BLUETOOTH PF_BLUETOOTH #define AF_MAX PF_MAX /* Socket level values. Others are defined in the appropriate headers. diff --git a/sysdeps/unix/sysv/linux/ia64/bits/socket.h b/sysdeps/unix/sysv/linux/ia64/bits/socket.h index 5f5fbafd86..9e3fe62723 100644 --- a/sysdeps/unix/sysv/linux/ia64/bits/socket.h +++ b/sysdeps/unix/sysv/linux/ia64/bits/socket.h @@ -88,6 +88,7 @@ enum __socket_type #define PF_IRDA 23 /* IRDA sockets. */ #define PF_PPPOX 24 /* PPPoX sockets. */ #define PF_WANPIPE 25 /* Wanpipe API sockets. */ +#define PF_BLUETOOTH 31 /* Bluetooth sockets. */ #define PF_MAX 32 /* For now.. */ /* Address families. */ @@ -119,6 +120,7 @@ enum __socket_type #define AF_IRDA PF_IRDA #define AF_PPPOX PF_PPPOX #define AF_WANPIPE PF_WANPIPE +#define AF_BLUETOOTH PF_BLUETOOTH #define AF_MAX PF_MAX /* Socket level values. Others are defined in the appropriate headers. diff --git a/sysdeps/unix/sysv/linux/mips/bits/ioctl-types.h b/sysdeps/unix/sysv/linux/mips/bits/ioctl-types.h index 573f9e7ca3..e40a0ad96e 100644 --- a/sysdeps/unix/sysv/linux/mips/bits/ioctl-types.h +++ b/sysdeps/unix/sysv/linux/mips/bits/ioctl-types.h @@ -1,5 +1,5 @@ /* Structure types for pre-termios terminal ioctls. Linux/MIPS version. - Copyright (C) 1997, 1999, 2000 Free Software Foundation, Inc. + Copyright (C) 1997, 1999, 2000, 2001 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -73,3 +73,4 @@ struct termio #define N_SMSBLOCK 12 /* SMS block mode */ #define N_HDLC 13 /* synchronous HDLC */ #define N_SYNC_PPP 14 /* synchronous PPP */ +#define N_HCI 15 /* Bluetooth HCI UART */ diff --git a/sysdeps/unix/sysv/linux/mips/bits/socket.h b/sysdeps/unix/sysv/linux/mips/bits/socket.h index eaf8ccc3d2..9e38d288b7 100644 --- a/sysdeps/unix/sysv/linux/mips/bits/socket.h +++ b/sysdeps/unix/sysv/linux/mips/bits/socket.h @@ -88,6 +88,7 @@ enum __socket_type #define PF_IRDA 23 /* IRDA sockets. */ #define PF_PPPOX 24 /* PPPoX sockets. */ #define PF_WANPIPE 25 /* Wanpipe API sockets. */ +#define PF_BLUETOOTH 31 /* Bluetooth sockets. */ #define PF_MAX 32 /* For now.. */ /* Address families. */ @@ -119,6 +120,7 @@ enum __socket_type #define AF_IRDA PF_IRDA #define AF_PPPOX PF_PPPOX #define AF_WANPIPE PF_WANPIPE +#define AF_BLUETOOTH PF_BLUETOOTH #define AF_MAX PF_MAX /* Socket level values. Others are defined in the appropriate headers. diff --git a/sysdeps/unix/sysv/linux/net/if_arp.h b/sysdeps/unix/sysv/linux/net/if_arp.h index 5625030ff5..23b51e071c 100644 --- a/sysdeps/unix/sysv/linux/net/if_arp.h +++ b/sysdeps/unix/sysv/linux/net/if_arp.h @@ -122,7 +122,7 @@ struct arphdr #define ARPHRD_FCPL 786 /* Fibrechanel public loop. */ #define ARPHRD_FCPFABRIC 787 /* Fibrechanel fabric. */ #define ARPHRD_IEEE802_TR 800 /* Magic type ident for TR. */ - +#define ARPHRD_IEEE80211 801 /* IEEE 802.11. */ /* ARP ioctl request. */ struct arpreq diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/termios.h b/sysdeps/unix/sysv/linux/powerpc/bits/termios.h index 85bd16203f..a445fa692b 100644 --- a/sysdeps/unix/sysv/linux/powerpc/bits/termios.h +++ b/sysdeps/unix/sysv/linux/powerpc/bits/termios.h @@ -43,9 +43,9 @@ struct termios { }; /* c_cc characters */ -#define VINTR 0 -#define VQUIT 1 -#define VERASE 2 +#define VINTR 0 +#define VQUIT 1 +#define VERASE 2 #define VKILL 3 #define VEOF 4 #define VMIN 5 @@ -54,9 +54,9 @@ struct termios { #define VEOL2 8 #define VSWTC 9 -#define VWERASE 10 +#define VWERASE 10 #define VREPRINT 11 -#define VSUSP 12 +#define VSUSP 12 #define VSTART 13 #define VSTOP 14 #define VLNEXT 15 @@ -297,3 +297,4 @@ struct termio { #define N_SMSBLOCK 12 /* SMS block mode */ #define N_HDLC 13 /* synchronous HDLC */ #define N_SYNC_PPP 14 /* synchronous PPP */ +#define N_HCI 15 /* Bluetooth HCI UART */ diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/bits/socket.h b/sysdeps/unix/sysv/linux/s390/s390-64/bits/socket.h index 52ae120f8b..a255d26ffc 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/bits/socket.h +++ b/sysdeps/unix/sysv/linux/s390/s390-64/bits/socket.h @@ -88,6 +88,7 @@ enum __socket_type #define PF_IRDA 23 /* IRDA sockets. */ #define PF_PPPOX 24 /* PPPoX sockets. */ #define PF_WANPIPE 25 /* Wanpipe API sockets. */ +#define PF_BLUETOOTH 31 /* Bluetooth sockets. */ #define PF_MAX 32 /* For now.. */ /* Address families. */ @@ -119,6 +120,7 @@ enum __socket_type #define AF_IRDA PF_IRDA #define AF_PPPOX PF_PPPOX #define AF_WANPIPE PF_WANPIPE +#define AF_BLUETOOTH PF_BLUETOOTH #define AF_MAX PF_MAX /* Socket level values. Others are defined in the appropriate headers. diff --git a/sysdeps/unix/sysv/linux/sparc/bits/socket.h b/sysdeps/unix/sysv/linux/sparc/bits/socket.h index 1987be6e25..d22f528f99 100644 --- a/sysdeps/unix/sysv/linux/sparc/bits/socket.h +++ b/sysdeps/unix/sysv/linux/sparc/bits/socket.h @@ -88,6 +88,7 @@ enum __socket_type #define PF_IRDA 23 /* IRDA sockets. */ #define PF_PPPOX 24 /* PPPoX sockets. */ #define PF_WANPIPE 25 /* Wanpipe API sockets. */ +#define PF_BLUETOOTH 31 /* Bluetooth sockets. */ #define PF_MAX 32 /* For now.. */ /* Address families. */ @@ -119,6 +120,7 @@ enum __socket_type #define AF_IRDA PF_IRDA #define AF_PPPOX PF_PPPOX #define AF_WANPIPE PF_WANPIPE +#define AF_BLUETOOTH PF_BLUETOOTH #define AF_MAX PF_MAX /* Socket level values. Others are defined in the appropriate headers. |