diff options
Diffstat (limited to 'sysdeps/unix/sysv/linux/alpha')
| -rw-r--r-- | sysdeps/unix/sysv/linux/alpha/bits/fcntl.h (renamed from sysdeps/unix/sysv/linux/alpha/fcntlbits.h) | 8 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/alpha/bits/ioctls.h (renamed from sysdeps/unix/sysv/linux/alpha/ioctls.h) | 12 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/alpha/bits/ipc.h (renamed from sysdeps/unix/sysv/linux/alpha/sys/ipc_buf.h) | 0 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/alpha/bits/sigaction.h (renamed from sysdeps/unix/sysv/linux/alpha/sigaction.h) | 0 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/alpha/bits/signum.h (renamed from sysdeps/unix/sysv/linux/alpha/signum.h) | 0 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/alpha/bits/stat.h (renamed from sysdeps/unix/sysv/linux/alpha/statbuf.h) | 10 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/alpha/bits/termios.h (renamed from sysdeps/unix/sysv/linux/alpha/termbits.h) | 0 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/alpha/bits/time.h (renamed from sysdeps/unix/sysv/linux/alpha/timebits.h) | 12 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/alpha/bits/types.h (renamed from sysdeps/unix/sysv/linux/alpha/gnu/types.h) | 33 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/alpha/brk.S | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/alpha/clone.S | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/alpha/kernel_termios.h | 44 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/alpha/sys/kernel_termios.h | 25 |
13 files changed, 90 insertions, 58 deletions
diff --git a/sysdeps/unix/sysv/linux/alpha/fcntlbits.h b/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h index 6e1c843ccb..b70502f21a 100644 --- a/sysdeps/unix/sysv/linux/alpha/fcntlbits.h +++ b/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h @@ -17,8 +17,10 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _FCNTLBITS_H -#define _FCNTLBITS_H 1 +#ifndef _FCNTL_H +#error "Never use <bits/fcntl.h> directly; include <fcntl.h> instead." +#endif + #include <sys/types.h> @@ -96,5 +98,3 @@ struct flock #define FNONBLOCK O_NONBLOCK #define FNDELAY O_NDELAY #endif /* Use BSD. */ - -#endif /* fcntlbits.h */ diff --git a/sysdeps/unix/sysv/linux/alpha/ioctls.h b/sysdeps/unix/sysv/linux/alpha/bits/ioctls.h index 80b2e62e77..8a14f99f43 100644 --- a/sysdeps/unix/sysv/linux/alpha/ioctls.h +++ b/sysdeps/unix/sysv/linux/alpha/bits/ioctls.h @@ -16,12 +16,16 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _IOCTLS_H -#define _IOCTLS_H 1 +/* + * Never include this file directly; use <sys/ioctl.h> instead. + */ + +#ifndef _BITS_IOCTLS_H +#define _BITS_IOCTLS_H 1 /* Use the definitions from the kernel header files. */ #include <asm/ioctls.h> -#include <sys/kernel_termios.h> +#include <kernel_termios.h> /* Oh well, this is necessary since the kernel data structure is different from the user-level version. */ @@ -36,4 +40,4 @@ #include <linux/sockios.h> -#endif /* ioctls.h */ +#endif /* bits/ioctls.h */ diff --git a/sysdeps/unix/sysv/linux/alpha/sys/ipc_buf.h b/sysdeps/unix/sysv/linux/alpha/bits/ipc.h index 57830daae1..57830daae1 100644 --- a/sysdeps/unix/sysv/linux/alpha/sys/ipc_buf.h +++ b/sysdeps/unix/sysv/linux/alpha/bits/ipc.h diff --git a/sysdeps/unix/sysv/linux/alpha/sigaction.h b/sysdeps/unix/sysv/linux/alpha/bits/sigaction.h index 57ce5e6ded..57ce5e6ded 100644 --- a/sysdeps/unix/sysv/linux/alpha/sigaction.h +++ b/sysdeps/unix/sysv/linux/alpha/bits/sigaction.h diff --git a/sysdeps/unix/sysv/linux/alpha/signum.h b/sysdeps/unix/sysv/linux/alpha/bits/signum.h index be6132d42f..be6132d42f 100644 --- a/sysdeps/unix/sysv/linux/alpha/signum.h +++ b/sysdeps/unix/sysv/linux/alpha/bits/signum.h diff --git a/sysdeps/unix/sysv/linux/alpha/statbuf.h b/sysdeps/unix/sysv/linux/alpha/bits/stat.h index 207fa0ca1c..768b8192ff 100644 --- a/sysdeps/unix/sysv/linux/alpha/statbuf.h +++ b/sysdeps/unix/sysv/linux/alpha/bits/stat.h @@ -16,8 +16,12 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _STATBUF_H -#define _STATBUF_H 1 +/* + * Never include this file directly; use <sys/stat.h> instead. + */ + +#ifndef _BITS_STAT_H +#define _BITS_STAT_H 1 /* Versions of the `struct stat' data structure. */ #define _STAT_VER_LINUX_OLD 0 @@ -71,4 +75,4 @@ struct stat #define __S_IWRITE 0200 /* Write by owner. */ #define __S_IEXEC 0100 /* Execute by owner. */ -#endif /* statbuf.h */ +#endif /* bits/stat.h */ diff --git a/sysdeps/unix/sysv/linux/alpha/termbits.h b/sysdeps/unix/sysv/linux/alpha/bits/termios.h index d0932c1cd7..d0932c1cd7 100644 --- a/sysdeps/unix/sysv/linux/alpha/termbits.h +++ b/sysdeps/unix/sysv/linux/alpha/bits/termios.h diff --git a/sysdeps/unix/sysv/linux/alpha/timebits.h b/sysdeps/unix/sysv/linux/alpha/bits/time.h index 1ad0df8c5b..7475b68f5b 100644 --- a/sysdeps/unix/sysv/linux/alpha/timebits.h +++ b/sysdeps/unix/sysv/linux/alpha/bits/time.h @@ -1,5 +1,5 @@ /* System-dependent timing definitions. Linux/Alpha version. - Copyright (C) 1996 Free Software Foundation, Inc. + Copyright (C) 1996, 1997 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 @@ -17,6 +17,10 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +/* + * Never include this file directly; use <time.h> instead. + */ + #ifdef __need_timeval # undef __need_timeval # ifndef _STRUCT_TIMEVAL @@ -32,8 +36,8 @@ struct timeval #endif /* need timeval */ -#ifndef _TIMEBITS_H -# define _TIMEBITS_H 1 +#ifndef _BITS_TIME_H +#define _BITS_TIME_H 1 /* ISO/IEC 9899:1990 7.12.1: <time.h> The macro `CLOCKS_PER_SEC' is the number per second of the value @@ -47,4 +51,4 @@ struct timeval presents the real value for clock ticks per second for the system. */ # define CLK_TCK 1024 -#endif /* timebits.h */ +#endif /* bits/time.h */ diff --git a/sysdeps/unix/sysv/linux/alpha/gnu/types.h b/sysdeps/unix/sysv/linux/alpha/bits/types.h index 2af77f70cf..9a4666a508 100644 --- a/sysdeps/unix/sysv/linux/alpha/gnu/types.h +++ b/sysdeps/unix/sysv/linux/alpha/bits/types.h @@ -16,8 +16,12 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _GNU_TYPES_H -#define _GNU_TYPES_H 1 +/* + * Never include this file directly; use <sys/types.h> instead. + */ + +#ifndef _BITS_TYPES_H +#define _BITS_TYPES_H 1 #include <features.h> @@ -26,19 +30,16 @@ typedef unsigned char __u_char; typedef unsigned short __u_short; typedef unsigned int __u_int; typedef unsigned long __u_long; -#ifdef __GNUC__ -typedef unsigned long long int __u_quad_t; -typedef long long int __quad_t; -#else -typedef struct - { - long int __val[2]; - } __quad_t; -typedef struct - { - __u_long __val[2]; - } __u_quad_t; -#endif +typedef unsigned long int __u_quad_t; +typedef long int __quad_t; +typedef signed char __int8_t; +typedef unsigned char __uint8_t; +typedef signed short int __int16_t; +typedef unsigned short int __uint16_t; +typedef signed int __int32_t; +typedef unsigned int __uint32_t; +typedef signed long int __int64_t; +typedef unsigned long int __uint64_t; typedef __quad_t *__qaddr_t; typedef __u_long __dev_t; /* Type of device numbers. */ @@ -91,4 +92,4 @@ typedef struct typedef int __key_t; -#endif /* gnu/types.h */ +#endif /* bits/types.h */ diff --git a/sysdeps/unix/sysv/linux/alpha/brk.S b/sysdeps/unix/sysv/linux/alpha/brk.S index be0539b475..6f994937d3 100644 --- a/sysdeps/unix/sysv/linux/alpha/brk.S +++ b/sysdeps/unix/sysv/linux/alpha/brk.S @@ -23,7 +23,7 @@ #include <sysdep.h> #define _ERRNO_H -#include <errnos.h> +#include <bits/errno.h> #ifdef PIC .section .bss diff --git a/sysdeps/unix/sysv/linux/alpha/clone.S b/sysdeps/unix/sysv/linux/alpha/clone.S index aab4e590a5..3f097fe068 100644 --- a/sysdeps/unix/sysv/linux/alpha/clone.S +++ b/sysdeps/unix/sysv/linux/alpha/clone.S @@ -22,7 +22,7 @@ #include <sysdep.h> #define _ERRNO_H 1 -#include <errnos.h> +#include <bits/errno.h> /* int clone(int (*fn)(void *arg), void *child_stack, int flags, void *arg) */ diff --git a/sysdeps/unix/sysv/linux/alpha/kernel_termios.h b/sysdeps/unix/sysv/linux/alpha/kernel_termios.h new file mode 100644 index 0000000000..093ac25096 --- /dev/null +++ b/sysdeps/unix/sysv/linux/alpha/kernel_termios.h @@ -0,0 +1,44 @@ +/* Copyright (C) 1997 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 + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#ifndef _KERNEL_TERMIOS_H +#define _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 <bits/termios.h> + +#define __KERNEL_NCCS 19 + +struct __kernel_termios + { + tcflag_t c_iflag; /* input mode flags */ + tcflag_t c_oflag; /* output mode flags */ + tcflag_t c_cflag; /* control mode flags */ + tcflag_t c_lflag; /* local mode flags */ + cc_t c_cc[__KERNEL_NCCS]; /* control characters */ + cc_t c_line; /* line discipline */ + speed_t c_ispeed; /* input speed */ + speed_t c_ospeed; /* output speed */ + }; + +#define _HAVE_C_ISPEED 1 +#define _HAVE_C_OSPEED 1 + +#endif /* kernel_termios.h */ diff --git a/sysdeps/unix/sysv/linux/alpha/sys/kernel_termios.h b/sysdeps/unix/sysv/linux/alpha/sys/kernel_termios.h deleted file mode 100644 index 4be759a51f..0000000000 --- a/sysdeps/unix/sysv/linux/alpha/sys/kernel_termios.h +++ /dev/null @@ -1,25 +0,0 @@ -#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 - { - tcflag_t c_iflag; /* input mode flags */ - tcflag_t c_oflag; /* output mode flags */ - tcflag_t c_cflag; /* control mode flags */ - tcflag_t c_lflag; /* local mode flags */ - cc_t c_cc[__KERNEL_NCCS]; /* control characters */ - cc_t c_line; /* line discipline */ - speed_t c_ispeed; /* input speed */ - speed_t c_ospeed; /* output speed */ - }; - -#define _HAVE_C_ISPEED 1 -#define _HAVE_C_OSPEED 1 - -#endif /* sys/kernel_termios.h */ |