diff options
Diffstat (limited to 'sysdeps/unix/sysv/linux/sparc')
-rw-r--r-- | sysdeps/unix/sysv/linux/sparc/bits/ioctls.h | 11 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/sparc/bits/poll.h | 3 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/sparc/bits/sigaction.h | 6 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/sparc/bits/termios.h | 17 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/sparc/sparc32/bits/mman.h | 4 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/sparc/sparc64/bits/mman.h | 4 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/sparc/sparc64/bits/setjmp.h | 8 |
7 files changed, 27 insertions, 26 deletions
diff --git a/sysdeps/unix/sysv/linux/sparc/bits/ioctls.h b/sysdeps/unix/sysv/linux/sparc/bits/ioctls.h index b33493ee46..1a8d5f6f81 100644 --- a/sysdeps/unix/sysv/linux/sparc/bits/ioctls.h +++ b/sysdeps/unix/sysv/linux/sparc/bits/ioctls.h @@ -16,12 +16,9 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - * Never include this file directly; use <sys/ioctl.h> instead. - */ - -#ifndef _BITS_IOCTLS_H -#define _BITS_IOCTLS_H 1 +#ifndef _SYS_IOCTL_H +# error "Never use <bits/ioctls.h> directly; include <sys/ioctl.h> instead." +#endif /* Use the definitions from the kernel header files. */ #include <asm/ioctls.h> @@ -39,5 +36,3 @@ #define TCSETSF _IOW ('T', 11, char[36]) #include <linux/sockios.h> - -#endif /* bits/ioctls.h */ diff --git a/sysdeps/unix/sysv/linux/sparc/bits/poll.h b/sysdeps/unix/sysv/linux/sparc/bits/poll.h index 8fea43924a..2d4e6f6f01 100644 --- a/sysdeps/unix/sysv/linux/sparc/bits/poll.h +++ b/sysdeps/unix/sysv/linux/sparc/bits/poll.h @@ -16,6 +16,9 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifndef _SYS_POLL_H +# error "Never use <bits/poll.h> directly; include <sys/poll.h> instead." +#endif /* Event types that can be polled for. These bits may be set in `events' to indicate the interesting event types; they will appear in `revents' diff --git a/sysdeps/unix/sysv/linux/sparc/bits/sigaction.h b/sysdeps/unix/sysv/linux/sparc/bits/sigaction.h index 13471995b9..1858ef4857 100644 --- a/sysdeps/unix/sysv/linux/sparc/bits/sigaction.h +++ b/sysdeps/unix/sysv/linux/sparc/bits/sigaction.h @@ -17,6 +17,10 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifndef _SIGNAL_H +# error "Never include <bits/sigaction.h> directly; use <signal.h> instead." +#endif + /* Structure describing the action to be taken when a signal arrives. */ struct sigaction { @@ -30,7 +34,7 @@ struct sigaction unsigned long sa_flags; /* Not used by Linux/Sparc yet. */ - void (*sa_restorer)(void); + void (*sa_restorer) __P ((void)); }; diff --git a/sysdeps/unix/sysv/linux/sparc/bits/termios.h b/sysdeps/unix/sysv/linux/sparc/bits/termios.h index 54ac773b70..7047e47a02 100644 --- a/sysdeps/unix/sysv/linux/sparc/bits/termios.h +++ b/sysdeps/unix/sysv/linux/sparc/bits/termios.h @@ -17,8 +17,9 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _SPARC_TERMBITS_H -#define _SPARC_TERMBITS_H 1 +#ifndef _TERMIOS_H +# error "Never include <bits/termios.h> directly; use <termios.h> instead." +#endif typedef unsigned char cc_t; typedef unsigned int speed_t; @@ -34,7 +35,7 @@ struct termios cc_t c_line; /* line discipline */ cc_t c_cc[NCCS]; /* control characters */ #ifdef __KERNEL__ -#define SIZEOF_USER_TERMIOS sizeof (struct termios) - (2*sizeof (cc_t)) +# define SIZEOF_USER_TERMIOS sizeof (struct termios) - (2*sizeof (cc_t)) cc_t _x_cc[2]; /* We need them to hold vmin/vtime */ #endif }; @@ -64,11 +65,11 @@ struct termios * shared with eof/eol */ #ifdef __KERNEL__ -#define VMIN 16 -#define VTIME 17 +# define VMIN 16 +# define VTIME 17 #else -#define VMIN VEOF -#define VTIME VEOL +# define VMIN VEOF +# define VTIME VEOL #endif /* c_iflag bits */ @@ -213,5 +214,3 @@ struct termios #define TCSANOW 0 #define TCSADRAIN 1 #define TCSAFLUSH 2 - -#endif /* !(_SPARC_TERMBITS_H) */ diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/bits/mman.h b/sysdeps/unix/sysv/linux/sparc/sparc32/bits/mman.h index 3e7f2900fa..bc70a58e24 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/bits/mman.h +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/bits/mman.h @@ -1,4 +1,4 @@ -/* Definitions for POSIX memory map inerface. Linux/SPARC version. +/* Definitions for POSIX memory map interface. Linux/SPARC version. Copyright (C) 1997 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -18,7 +18,7 @@ Boston, MA 02111-1307, USA. */ #ifndef _SYS_MMAN_H -# error "Never include this file directly. Use <sys/mman.h> instead" +# error "Never use <bits/mman.h> directly; include <sys/mman.h> instead." #endif /* The following definitions basically come from the kernel headers. diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/bits/mman.h b/sysdeps/unix/sysv/linux/sparc/sparc64/bits/mman.h index 3e7f2900fa..bc70a58e24 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/bits/mman.h +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/bits/mman.h @@ -1,4 +1,4 @@ -/* Definitions for POSIX memory map inerface. Linux/SPARC version. +/* Definitions for POSIX memory map interface. Linux/SPARC version. Copyright (C) 1997 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -18,7 +18,7 @@ Boston, MA 02111-1307, USA. */ #ifndef _SYS_MMAN_H -# error "Never include this file directly. Use <sys/mman.h> instead" +# error "Never use <bits/mman.h> directly; include <sys/mman.h> instead." #endif /* The following definitions basically come from the kernel headers. diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/bits/setjmp.h b/sysdeps/unix/sysv/linux/sparc/sparc64/bits/setjmp.h index ab850e5301..b200b718d2 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/bits/setjmp.h +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/bits/setjmp.h @@ -16,11 +16,11 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _JMP_BUF_H -#define _JMP_BUF_H 1 + +#ifndef _SETJMP_H +# error "Never include <bits/setjmp.h> directly; use <setjmp.h> instead." +#endif #include <ucontext.h> typedef ucontext_t __jmp_buf[1]; - -#endif /* jmp_buf.h */ |