diff options
Diffstat (limited to 'sysdeps/unix/bsd')
-rw-r--r-- | sysdeps/unix/bsd/bits/dirent.h | 4 | ||||
-rw-r--r-- | sysdeps/unix/bsd/bits/stat.h | 12 | ||||
-rw-r--r-- | sysdeps/unix/bsd/bits/waitflags.h | 4 | ||||
-rw-r--r-- | sysdeps/unix/bsd/bsd4.4/bits/dirent.h | 4 | ||||
-rw-r--r-- | sysdeps/unix/bsd/osf/alpha/bits/stat.h | 12 | ||||
-rw-r--r-- | sysdeps/unix/bsd/osf/bits/sigaction.h | 4 | ||||
-rw-r--r-- | sysdeps/unix/bsd/sun/m68k/bits/sigcontext.h | 4 | ||||
-rw-r--r-- | sysdeps/unix/bsd/sun/sparc/bits/sigcontext.h | 4 | ||||
-rw-r--r-- | sysdeps/unix/bsd/sun/sunos4/bits/resource.h | 7 | ||||
-rw-r--r-- | sysdeps/unix/bsd/sun/sunos4/bits/termios.h | 112 | ||||
-rw-r--r-- | sysdeps/unix/bsd/sun/sunos4/bits/utsname.h | 22 | ||||
-rw-r--r-- | sysdeps/unix/bsd/ultrix4/bits/utsname.h | 22 | ||||
-rw-r--r-- | sysdeps/unix/bsd/ultrix4/mips/bits/sigcontext.h | 5 |
13 files changed, 140 insertions, 76 deletions
diff --git a/sysdeps/unix/bsd/bits/dirent.h b/sysdeps/unix/bsd/bits/dirent.h index 6f88661694..642c79183e 100644 --- a/sysdeps/unix/bsd/bits/dirent.h +++ b/sysdeps/unix/bsd/bits/dirent.h @@ -17,6 +17,10 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifndef _DIRENT_H +# error "Never use <bits/dirent.h> directly; include <dirent.h> instead." +#endif + struct dirent { unsigned int d_fileno; /* 32 bits. */ diff --git a/sysdeps/unix/bsd/bits/stat.h b/sysdeps/unix/bsd/bits/stat.h index 71130f3fcb..8722fa0249 100644 --- a/sysdeps/unix/bsd/bits/stat.h +++ b/sysdeps/unix/bsd/bits/stat.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/stat.h> instead. - */ - -#ifndef _STATBUF_H -#define _STATBUF_H 1 +#ifndef _SYS_STAT_H +# error "Never include <bits/stat.h> directly; use <sys/stat.h> instead." +#endif #include <bits/types.h> @@ -82,6 +79,3 @@ struct stat #define __S_IREAD 0400 /* Read by owner. */ #define __S_IWRITE 0200 /* Write by owner. */ #define __S_IEXEC 0100 /* Execute by owner. */ - - -#endif /* bits/stat.h */ diff --git a/sysdeps/unix/bsd/bits/waitflags.h b/sysdeps/unix/bsd/bits/waitflags.h index ca952f90b4..47fc6ea1b7 100644 --- a/sysdeps/unix/bsd/bits/waitflags.h +++ b/sysdeps/unix/bsd/bits/waitflags.h @@ -18,7 +18,7 @@ Boston, MA 02111-1307, USA. */ #ifndef _SYS_WAIT_H -#error "Never use <bits/waitflags.h> directly; include <sys/wait.h> instead." +# error "Never include <bits/waitflags.h> directly; use <sys/wait.h> instead." #endif @@ -26,5 +26,5 @@ #define WNOHANG 1 /* Don't block waiting. */ #define WUNTRACED 2 /* Report status of stopped children. */ #ifdef __USE_GNU -#define WNOREAP 4 /* Don't remove record of child reported. */ +# define WNOREAP 4 /* Don't remove record of child reported. */ #endif diff --git a/sysdeps/unix/bsd/bsd4.4/bits/dirent.h b/sysdeps/unix/bsd/bsd4.4/bits/dirent.h index b9e0d7277e..e29dac4806 100644 --- a/sysdeps/unix/bsd/bsd4.4/bits/dirent.h +++ b/sysdeps/unix/bsd/bsd4.4/bits/dirent.h @@ -17,6 +17,10 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifndef _DIRENT_H +# error "Never use <bits/dirent.h> directly; include <dirent.h> instead." +#endif + struct dirent { __ino_t d_fileno; /* File serial number. */ diff --git a/sysdeps/unix/bsd/osf/alpha/bits/stat.h b/sysdeps/unix/bsd/osf/alpha/bits/stat.h index ab0fa48f68..7084b4e534 100644 --- a/sysdeps/unix/bsd/osf/alpha/bits/stat.h +++ b/sysdeps/unix/bsd/osf/alpha/bits/stat.h @@ -1,6 +1,5 @@ /* Copyright (C) 1993, 1996, 1997 Free Software Foundation, Inc. This file is part of the GNU C Library. - Contributed by Brendan Kehoe (brendan@zen.org). 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 @@ -17,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/stat.h> instead. - */ - -#ifndef _BITS_STAT_H -#define _BITS_STAT_H +#ifndef _SYS_STAT_H +# error "Never include <bits/stat.h> directly; use <sys/stat.h> instead." +#endif #include <bits/types.h> @@ -76,5 +72,3 @@ struct stat #define __S_IREAD 0400 /* Read by owner. */ #define __S_IWRITE 0200 /* Write by owner. */ #define __S_IEXEC 0100 /* Execute by owner. */ - -#endif /* bits/stat.h */ diff --git a/sysdeps/unix/bsd/osf/bits/sigaction.h b/sysdeps/unix/bsd/osf/bits/sigaction.h index 56e28a04fb..6bf030793e 100644 --- a/sysdeps/unix/bsd/osf/bits/sigaction.h +++ b/sysdeps/unix/bsd/osf/bits/sigaction.h @@ -18,6 +18,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 { diff --git a/sysdeps/unix/bsd/sun/m68k/bits/sigcontext.h b/sysdeps/unix/bsd/sun/m68k/bits/sigcontext.h index 61481cc6a2..f637efa6cd 100644 --- a/sysdeps/unix/bsd/sun/m68k/bits/sigcontext.h +++ b/sysdeps/unix/bsd/sun/m68k/bits/sigcontext.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 use <bits/sigcontext.h> directly; include <signal.h> instead." +#endif + struct sigcontext { int sc_onstack; diff --git a/sysdeps/unix/bsd/sun/sparc/bits/sigcontext.h b/sysdeps/unix/bsd/sun/sparc/bits/sigcontext.h index e1cdd416a1..29d2d87b26 100644 --- a/sysdeps/unix/bsd/sun/sparc/bits/sigcontext.h +++ b/sysdeps/unix/bsd/sun/sparc/bits/sigcontext.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 use <bits/sigcontext.h> directly; include <signal.h> instead." +#endif + struct sigcontext { int sc_onstack; diff --git a/sysdeps/unix/bsd/sun/sunos4/bits/resource.h b/sysdeps/unix/bsd/sun/sunos4/bits/resource.h index f51262d92d..6978c87dd2 100644 --- a/sysdeps/unix/bsd/sun/sunos4/bits/resource.h +++ b/sysdeps/unix/bsd/sun/sunos4/bits/resource.h @@ -17,6 +17,10 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifndef _SYS_RESOURCE_H +# error "Never use <bits/resource.h> directly; include <sys/resource.h> instead." +#endif + /* These are the values for 4.4 BSD and GNU. Earlier BSD systems have a subset of these kinds of resource limit. In systems where `getrlimit' and `setrlimit' are not system calls, these are the values used by the C @@ -110,7 +114,8 @@ enum __rusage_who #define RUSAGE_CHILDREN RUSAGE_CHILDREN }; -#include <sys/time.h> /* For `struct timeval'. */ +#define __need_timeval +#include <bits/time.h> /* For `struct timeval'. */ /* Structure which says how much of each resource has been used. */ struct rusage diff --git a/sysdeps/unix/bsd/sun/sunos4/bits/termios.h b/sysdeps/unix/bsd/sun/sunos4/bits/termios.h index dc0a007208..15aaab795a 100644 --- a/sysdeps/unix/bsd/sun/sunos4/bits/termios.h +++ b/sysdeps/unix/bsd/sun/sunos4/bits/termios.h @@ -1,5 +1,5 @@ /* termios type and macro definitions. SunOS 4 version. - Copyright (C) 1993, 1994, 1996 Free Software Foundation, Inc. + Copyright (C) 1993, 1994, 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. */ +#ifndef _TERMIOS_H +# error "Never include <bits/termios.h> directly; use <termios.h> instead." +#endif + /* Type of terminal control flag masks. */ typedef unsigned long int tcflag_t; @@ -41,51 +45,51 @@ struct termios #define IGNCR 0x0080 /* Ignore CR. */ #define ICRNL 0x0100 /* Map CR to NL on input. */ #ifdef __USE_BSD -#define IUCLC 0x0200 /* Map upper case to lower case on input. */ +# define IUCLC 0x0200 /* Map upper case to lower case on input. */ #endif #define IXON 0x0400 /* Enable start/stop output control. */ #define IXOFF 0x1000 /* Enable start/stop input control. */ #ifdef __USE_BSD -#define IXANY 0x0800 /* Any character will restart after stop. */ -#define IMAXBEL 0x2000 /* Ring bell when input queue is full. */ +# define IXANY 0x0800 /* Any character will restart after stop. */ +# define IMAXBEL 0x2000 /* Ring bell when input queue is full. */ #endif /* Output modes. */ tcflag_t c_oflag; #define OPOST 0x0001 /* Perform output processing. */ #ifdef __USE_BSD -#define OLCUC 0x00000002 /* Map lower case to upper case on output. */ -#define ONLCR 0x00000004 /* Map NL to CR-NL on output. */ -#define OCRNL 0x00000008 -#define ONOCR 0x00000010 -#define ONLRET 0x00000020 -#define OFILL 0x00000040 -#define OFDEL 0x00000080 -#define NLDLY 0x00000100 -#define NL0 0 -#define NL1 0x00000100 -#define CRDLY 0x00000600 -#define CR0 0 -#define CR1 0x00000200 -#define CR2 0x00000400 -#define CR3 0x00000600 -#define TABDLY 0x00001800 -#define TAB0 0 -#define TAB1 0x00000800 -#define TAB2 0x00001000 -#define XTABS 0x00001800 -#define TAB3 XTABS -#define BSDLY 0x00002000 -#define BS0 0 -#define BS1 0x00002000 -#define VTDLY 0x00004000 -#define VT0 0 -#define VT1 0x00004000 -#define FFDLY 0x00008000 -#define FF0 0 -#define FF1 0x00008000 -#define PAGEOUT 0x00010000 -#define WRAP 0x00020000 +# define OLCUC 0x00000002 /* Map lower case to upper case on output. */ +# define ONLCR 0x00000004 /* Map NL to CR-NL on output. */ +# define OCRNL 0x00000008 +# define ONOCR 0x00000010 +# define ONLRET 0x00000020 +# define OFILL 0x00000040 +# define OFDEL 0x00000080 +# define NLDLY 0x00000100 +# define NL0 0 +# define NL1 0x00000100 +# define CRDLY 0x00000600 +# define CR0 0 +# define CR1 0x00000200 +# define CR2 0x00000400 +# define CR3 0x00000600 +# define TABDLY 0x00001800 +# define TAB0 0 +# define TAB1 0x00000800 +# define TAB2 0x00001000 +# define XTABS 0x00001800 +# define TAB3 XTABS +# define BSDLY 0x00002000 +# define BS0 0 +# define BS1 0x00002000 +# define VTDLY 0x00004000 +# define VT0 0 +# define VT1 0x00004000 +# define FFDLY 0x00008000 +# define FF0 0 +# define FF1 0x00008000 +# define PAGEOUT 0x00010000 +# define WRAP 0x00020000 #endif /* Control modes. */ @@ -102,11 +106,11 @@ struct termios #define HUPCL 0x00000400 /* Hang up on last close. */ #define CLOCAL 0x00000800 /* Ignore modem status lines. */ #ifdef __USE_BSD -#define LOBLK 0x00001000 -#define CRTSCTS 0x80000000 -#define CIBAUD 0x000f0000 /* Mask for input speed from c_cflag. */ -#define CBAUD 0x0000000f /* Mask for output speed from c_cflag. */ -#define IBSHIFT 16 /* Bits to shift for input speed. */ +# define LOBLK 0x00001000 +# define CRTSCTS 0x80000000 +# define CIBAUD 0x000f0000 /* Mask for input speed from c_cflag. */ +# define CBAUD 0x0000000f /* Mask for output speed from c_cflag. */ +# define IBSHIFT 16 /* Bits to shift for input speed. */ #endif /* Input and output baud rates. These are encoded in c_cflag. */ @@ -127,29 +131,29 @@ struct termios #define B19200 14 #define B38400 15 #ifdef __USE_BSD -#define EXTA 14 -#define EXTB 15 +# define EXTA 14 +# define EXTB 15 #endif /* Local modes. */ tcflag_t c_lflag; #ifdef __USE_BSD -#define ECHOKE 0x00000800 /* Visual erase for KILL. */ +# define ECHOKE 0x00000800 /* Visual erase for KILL. */ #endif #define ECHOE 0x00000010 /* Visual erase for ERASE. */ #define ECHOK 0x00000020 /* Echo NL after KILL. */ #define ECHO 0x00000008 /* Enable echo. */ #define ECHONL 0x00000040 /* Echo NL even if ECHO is off. */ #ifdef __USE_BSD -#define ECHOPRT 0x00000400 /* Hardcopy visual erase. */ -#define ECHOCTL 0x00000200 /* Echo control characters as ^X. */ +# define ECHOPRT 0x00000400 /* Hardcopy visual erase. */ +# define ECHOCTL 0x00000200 /* Echo control characters as ^X. */ #endif #define ISIG 0x00000001 /* Enable signals. */ #define ICANON 0x00000002 /* Do erase and kill processing. */ #define IEXTEN 0x00008000 /* Enable DISCARD and LNEXT. */ #define TOSTOP 0x00000100 /* Send SIGTTOU for background output. */ #ifdef __USE_BSD -#define PENDIN 0x00004000 /* Retype pending input (state). */ +# define PENDIN 0x00004000 /* Retype pending input (state). */ #endif #define NOFLSH 0x00000080 /* Disable flush after interrupt. */ @@ -159,28 +163,28 @@ struct termios #define VEOF 4 /* End-of-file character [ICANON]. */ #define VEOL 5 /* End-of-line character [ICANON]. */ #ifdef __USE_BSD -#define VEOL2 6 /* Second EOL character [ICANON]. */ -#define VSWTCH 7 /* ??? */ +# define VEOL2 6 /* Second EOL character [ICANON]. */ +# define VSWTCH 7 /* ??? */ #endif #define VERASE 2 /* Erase character [ICANON]. */ #ifdef __USE_BSD -#define VWERASE 14 /* Word-erase character [ICANON]. */ +# define VWERASE 14 /* Word-erase character [ICANON]. */ #endif #define VKILL 3 /* Kill-line character [ICANON]. */ #ifdef __USE_BSD -#define VREPRINT 12 /* Reprint-line character [ICANON]. */ +# define VREPRINT 12 /* Reprint-line character [ICANON]. */ #endif #define VINTR 0 /* Interrupt character [ISIG]. */ #define VQUIT 1 /* Quit character [ISIG]. */ #define VSUSP 10 /* Suspend character [ISIG]. */ #ifdef __USE_BSD -#define VDSUSP 11 /* Delayed suspend character [ISIG]. */ +# define VDSUSP 11 /* Delayed suspend character [ISIG]. */ #endif #define VSTART 8 /* Start (X-ON) character [IXON, IXOFF]. */ #define VSTOP 9 /* Stop (X-OFF) character [IXON, IXOFF]. */ #ifdef __USE_BSD -#define VLNEXT 15 /* Literal-next character [IEXTEN]. */ -#define VDISCARD 13 /* Discard character [IEXTEN]. */ +# define VLNEXT 15 /* Literal-next character [IEXTEN]. */ +# define VDISCARD 13 /* Discard character [IEXTEN]. */ #endif #define VMIN VEOF /* Minimum number of bytes read at once [!ICANON]. */ #define VTIME VEOL /* Time-out value (tenths of a second) [!ICANON]. */ diff --git a/sysdeps/unix/bsd/sun/sunos4/bits/utsname.h b/sysdeps/unix/bsd/sun/sunos4/bits/utsname.h index e9111b6504..5a03bab0c2 100644 --- a/sysdeps/unix/bsd/sun/sunos4/bits/utsname.h +++ b/sysdeps/unix/bsd/sun/sunos4/bits/utsname.h @@ -1,2 +1,24 @@ +/* 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 _UTSNAME_H +# error "Never include <bits/utsname.h> directly; use <sys/utsname.h> instead." +#endif + #define _UTSNAME_LENGTH 9 #define _UTSNAME_NODENAME_LENGTH 65 diff --git a/sysdeps/unix/bsd/ultrix4/bits/utsname.h b/sysdeps/unix/bsd/ultrix4/bits/utsname.h index ad4389ab02..a9f36ab3d1 100644 --- a/sysdeps/unix/bsd/ultrix4/bits/utsname.h +++ b/sysdeps/unix/bsd/ultrix4/bits/utsname.h @@ -1 +1,23 @@ +/* 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 _UTSNAME_H +# error "Never include <bits/utsname.h> directly; use <sys/utsname.h> instead." +#endif + #define _UTSNAME_LENGTH 32 diff --git a/sysdeps/unix/bsd/ultrix4/mips/bits/sigcontext.h b/sysdeps/unix/bsd/ultrix4/mips/bits/sigcontext.h index 72b29e5649..cb66517eef 100644 --- a/sysdeps/unix/bsd/ultrix4/mips/bits/sigcontext.h +++ b/sysdeps/unix/bsd/ultrix4/mips/bits/sigcontext.h @@ -1,6 +1,5 @@ /* Copyright (C) 1992, 1994, 1997 Free Software Foundation, Inc. This file is part of the GNU C Library. - Contributed by Brendan Kehoe (brendan@zen.org). 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 @@ -17,6 +16,10 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifndef _SIGNAL_H +# error "Never use <bits/sigcontext.h> directly; include <signal.h> instead." +#endif + /* Note that ANY change to this instantly implies a change to __handler.S. */ struct sigcontext |