From: Ulrich Drepper Date: Wed, 26 Nov 1997 04:14:44 +0000 (+0000) Subject: Issue error message if the header is used directly. X-Git-Tag: glibc-2.16-ports-merge^2~3368 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=905714080fcea01e677a0723cbae0b4e23cf1262;p=platform%2Fupstream%2Fglibc.git Issue error message if the header is used directly. --- diff --git a/sysdeps/alpha/bits/endian.h b/sysdeps/alpha/bits/endian.h index e873d21..8a16e14 100644 --- a/sysdeps/alpha/bits/endian.h +++ b/sysdeps/alpha/bits/endian.h @@ -1,3 +1,7 @@ /* Alpha is little-endian. */ +#ifndef _ENDIAN_H +# error "Never use directly; include instead." +#endif + #define __BYTE_ORDER __LITTLE_ENDIAN diff --git a/sysdeps/alpha/bits/setjmp.h b/sysdeps/alpha/bits/setjmp.h index 9aa3046..de37019 100644 --- a/sysdeps/alpha/bits/setjmp.h +++ b/sysdeps/alpha/bits/setjmp.h @@ -17,6 +17,10 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifndef _SETJMP_H +# error "Never include directly; use instead." +#endif + /* The previous bits/setjmp.h had __jmp_buf defined as a structure. We use an array of 'long int' instead, to make writing the assembler easier. Naturally, user code should not depend on @@ -48,24 +52,24 @@ * registers. */ -#if defined(__USE_MISC) || defined(__ASSEMBLY__) -#define JB_S0 0 -#define JB_S1 1 -#define JB_S2 2 -#define JB_S3 3 -#define JB_S4 4 -#define JB_S5 5 -#define JB_PC 6 -#define JB_FP 7 -#define JB_SP 8 -#define JB_F2 9 -#define JB_F3 10 -#define JB_F4 11 -#define JB_F5 12 -#define JB_F6 13 -#define JB_F7 14 -#define JB_F8 15 -#define JB_F9 16 +#if defined __USE_MISC || defined __ASSEMBLY__ +# define JB_S0 0 +# define JB_S1 1 +# define JB_S2 2 +# define JB_S3 3 +# define JB_S4 4 +# define JB_S5 5 +# define JB_PC 6 +# define JB_FP 7 +# define JB_SP 8 +# define JB_F2 9 +# define JB_F3 10 +# define JB_F4 11 +# define JB_F5 12 +# define JB_F6 13 +# define JB_F7 14 +# define JB_F8 15 +# define JB_F9 16 #endif #ifndef __ASSEMBLY__ diff --git a/sysdeps/alpha/fpu/bits/fenv.h b/sysdeps/alpha/fpu/bits/fenv.h index 7cb0e3e..4482f0a 100644 --- a/sysdeps/alpha/fpu/bits/fenv.h +++ b/sysdeps/alpha/fpu/bits/fenv.h @@ -1,6 +1,5 @@ /* Copyright (C) 1997 Free Software Foundation, Inc. This file is part of the GNU C Library. - Contributed by Richard Henderson , 1997 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 @@ -18,7 +17,7 @@ Boston, MA 02111-1307, USA. */ #ifndef _FENV_H -#error "Never use directly; include instead." +# error "Never use directly; include instead." #endif @@ -51,20 +50,20 @@ enum FE_INVALID = 1UL << 17, #define FE_INVALID FE_INVALID - + FE_ALL_EXCEPT = (FE_INEXACT | FE_DIVBYZERO | FE_UNDERFLOW | FE_OVERFLOW | FE_INVALID) -#define FE_ALL_EXCEPT FE_ALL_EXCEPT +#define FE_ALL_EXCEPT FE_ALL_EXCEPT }; -/* Alpha chips support all four defined rouding modes. +/* Alpha chips support all four defined rouding modes. Note that code must be compiled to use dynamic rounding (/d) instructions to see these changes. For gcc this is -mfp-rounding-mode=d; for DEC cc - this is -fprm d. The default for both is static rounding to nearest. + this is -fprm d. The default for both is static rounding to nearest. - These are shifted down 58 bits from the hardware fpcr because the + These are shifted down 58 bits from the hardware fpcr because the functions are declared to take integers. */ enum @@ -100,5 +99,5 @@ typedef unsigned long fenv_t; #endif /* The system calls to talk to the kernel's FP code. */ -extern unsigned long __ieee_get_fp_control(void); -extern void __ieee_set_fp_control(unsigned long); +extern unsigned long int __ieee_get_fp_control __P ((void)); +extern void __ieee_set_fp_control __P ((unsigned long int __value)); diff --git a/sysdeps/arm/bits/endian.h b/sysdeps/arm/bits/endian.h index 32f8489..ad3b539 100644 --- a/sysdeps/arm/bits/endian.h +++ b/sysdeps/arm/bits/endian.h @@ -1,3 +1,7 @@ /* ARM is little-endian. */ +#ifndef _ENDIAN_H +# error "Never use directly; include instead." +#endif + #define __BYTE_ORDER __LITTLE_ENDIAN diff --git a/sysdeps/arm/bits/setjmp.h b/sysdeps/arm/bits/setjmp.h index 93b0f5f..5cf9cd7 100644 --- a/sysdeps/arm/bits/setjmp.h +++ b/sysdeps/arm/bits/setjmp.h @@ -1,10 +1,14 @@ /* Define the machine-dependent type `jmp_buf'. ARM version. */ +#ifndef _SETJMP_H +# error "Never include directly; use instead." +#endif + #ifndef _ASM /* Jump buffer contains v1-v6, sl, fp, sp, pc and (f4-f7) if we do FP. */ -#if __ARM_USES_FP +# if __ARM_USES_FP typedef int __jmp_buf[22]; -#else +# else typedef int __jmp_buf[10]; -#endif +# endif #endif diff --git a/sysdeps/m68k/bits/byteswap.h b/sysdeps/m68k/bits/byteswap.h index 54ec0d1..41bbe59 100644 --- a/sysdeps/m68k/bits/byteswap.h +++ b/sysdeps/m68k/bits/byteswap.h @@ -17,8 +17,9 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _BITS_BYTESWAP_H -#define _BITS_BYTESWAP_H 1 +#if !defined _BYTESWAP_H && !defined _NETINET_IN_H +# error "Never use directly; include instead." +#endif /* Swap bytes in 16 bit value. We don't provide an assembler version because GCC is smart enough to generate optimal assembler output, and @@ -32,7 +33,7 @@ (((x) & 0x0000ff00) << 8) | (((x) & 0x000000ff) << 24)) #if defined __GNUC__ && __GNUC__ >= 2 -#define __bswap_32(x) \ +# define __bswap_32(x) \ __extension__ \ ({ unsigned int __v; \ if (__builtin_constant_p (x)) \ @@ -45,12 +46,12 @@ : "0" (x)); \ __v; }) #else -#define __bswap_32(x) __bswap_constant_32 (x) +# define __bswap_32(x) __bswap_constant_32 (x) #endif #if defined __GNUC__ && __GNUC__ >= 2 /* Swap bytes in 64 bit value. */ -#define __bswap_64(x) \ +# define __bswap_64(x) \ __extension__ \ ({ union { unsigned long long int __ll; \ unsigned long int __l[2]; } __v, __r; \ @@ -59,5 +60,3 @@ __r.__l[1] = __bswap_32 (__v.__l[0]); \ __r.__ll; }) #endif - -#endif /* bits/byteswap.h */ diff --git a/sysdeps/m68k/bits/endian.h b/sysdeps/m68k/bits/endian.h index 6f98529..bf4ecb6 100644 --- a/sysdeps/m68k/bits/endian.h +++ b/sysdeps/m68k/bits/endian.h @@ -1,3 +1,7 @@ /* m68k is big-endian. */ +#ifndef _ENDIAN_H +# error "Never use directly; include instead." +#endif + #define __BYTE_ORDER __BIG_ENDIAN diff --git a/sysdeps/m68k/bits/setjmp.h b/sysdeps/m68k/bits/setjmp.h index 96240f0..2991232 100644 --- a/sysdeps/m68k/bits/setjmp.h +++ b/sysdeps/m68k/bits/setjmp.h @@ -1,5 +1,9 @@ /* Define the machine-dependent type `jmp_buf'. m68k version. */ +#ifndef _SETJMP_H +# error "Never include directly; use instead." +#endif + typedef struct { /* There are eight 4-byte data registers, but D0 is not saved. */ @@ -7,10 +11,10 @@ typedef struct /* There are six 4-byte address registers, plus the FP and SP. */ int *__aregs[6]; - int * __fp; - int * __sp; + int *__fp; + int *__sp; -#if defined(__HAVE_68881__) || defined(__HAVE_FPU__) +#if defined __HAVE_68881__ || defined __HAVE_FPU__ /* There are eight floating point registers which are saved in IEEE 96-bit extended format. */ char __fpregs[8 * (96 / 8)]; diff --git a/sysdeps/m68k/fpu/bits/fenv.h b/sysdeps/m68k/fpu/bits/fenv.h index ce071b9..a11e072 100644 --- a/sysdeps/m68k/fpu/bits/fenv.h +++ b/sysdeps/m68k/fpu/bits/fenv.h @@ -17,7 +17,7 @@ Boston, MA 02111-1307, USA. */ #ifndef _FENV_H -#error "Never use directly; include instead." +# error "Never use directly; include instead." #endif diff --git a/sysdeps/mach/hurd/alpha/bits/sigcontext.h b/sysdeps/mach/hurd/alpha/bits/sigcontext.h index 3b17a4a..a2c8163 100644 --- a/sysdeps/mach/hurd/alpha/bits/sigcontext.h +++ b/sysdeps/mach/hurd/alpha/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 directly; include instead." +#endif + /* Signal handlers are actually called: void handler (int sig, int code, struct sigcontext *scp); */ diff --git a/sysdeps/mach/hurd/hppa/bits/sigcontext.h b/sysdeps/mach/hurd/hppa/bits/sigcontext.h index f450125..f0b4ff7 100644 --- a/sysdeps/mach/hurd/hppa/bits/sigcontext.h +++ b/sysdeps/mach/hurd/hppa/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 directly; include instead." +#endif + /* Signal handlers are actually called: void handler (int sig, int code, struct sigcontext *scp); */ diff --git a/sysdeps/mach/hurd/mips/bits/sigcontext.h b/sysdeps/mach/hurd/mips/bits/sigcontext.h index 64a57ab..910618e 100644 --- a/sysdeps/mach/hurd/mips/bits/sigcontext.h +++ b/sysdeps/mach/hurd/mips/bits/sigcontext.h @@ -16,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 directly; include instead." +#endif + /* Signal handlers are actually called: void handler (int sig, int code, struct sigcontext *scp); */ diff --git a/sysdeps/mips/bits/dlfcn.h b/sysdeps/mips/bits/dlfcn.h index 636da56..c105537 100644 --- a/sysdeps/mips/bits/dlfcn.h +++ b/sysdeps/mips/bits/dlfcn.h @@ -17,8 +17,9 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _BITS_DLFCN_H -#define _BITS_DLFCN_H 1 +#ifndef _DLFCN_H +# error "Never use directly; include instead." +#endif /* The MODE argument to `dlopen' contains one of the following: */ #define RTLD_LAZY 0x001 /* Lazy function call binding. */ @@ -33,10 +34,9 @@ __BEGIN_DECLS /* Some SGI specific calls that aren't implemented yet. */ -extern void *sgidladd __P ((const char *, int)); -extern void *sgidlopen_version __P ((const char *, int, const char *, int)); -extern char *sgigetdsoversion __P ((const char *)); +extern void *sgidladd __P ((__const char *, int)); +extern void *sgidlopen_version __P ((__const char *, int, __const char *, + int)); +extern char *sgigetdsoversion __P ((__const char *)); __END_DECLS - -#endif /* bits/dlfcn.h */ diff --git a/sysdeps/mips/bits/endian.h b/sysdeps/mips/bits/endian.h index ba555cd..40321a2 100644 --- a/sysdeps/mips/bits/endian.h +++ b/sysdeps/mips/bits/endian.h @@ -1,4 +1,8 @@ /* The MIPS architecture has selectable endianness. This file is for a machine using big-endian mode. */ +#ifndef _ENDIAN_H +# error "Never use directly; include instead." +#endif + #define __BYTE_ORDER __BIG_ENDIAN diff --git a/sysdeps/mips/bits/setjmp.h b/sysdeps/mips/bits/setjmp.h index 7e570c6..ff3d75f 100644 --- a/sysdeps/mips/bits/setjmp.h +++ b/sysdeps/mips/bits/setjmp.h @@ -1,6 +1,5 @@ /* Define the machine-dependent type `jmp_buf'. MIPS version. Copyright (C) 1992, 1993, 1995, 1997 Free Software Foundation, Inc. - 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 _SETJMP_H +# error "Never include directly; use instead." +#endif + typedef struct { /* Program counter. */ diff --git a/sysdeps/mips/dec/bits/endian.h b/sysdeps/mips/dec/bits/endian.h index 157bc44..0bdb378 100644 --- a/sysdeps/mips/dec/bits/endian.h +++ b/sysdeps/mips/dec/bits/endian.h @@ -1,4 +1,8 @@ /* The MIPS architecture has selectable endianness. The DECstation uses little-endian mode. */ +#ifndef _ENDIAN_H +# error "Never use directly; include instead." +#endif + #define __BYTE_ORDER __LITTLE_ENDIAN diff --git a/sysdeps/mips/mips64/bits/setjmp.h b/sysdeps/mips/mips64/bits/setjmp.h index b108540..9f08f4e 100644 --- a/sysdeps/mips/mips64/bits/setjmp.h +++ b/sysdeps/mips/mips64/bits/setjmp.h @@ -1,7 +1,6 @@ /* Define the machine-dependent type `jmp_buf'. MIPS version. Copyright (C) 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 @@ -18,6 +17,10 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifndef _SETJMP_H +# error "Never include directly; use instead." +#endif + typedef struct { /* Program counter. */ diff --git a/sysdeps/mips/mipsel/bits/endian.h b/sysdeps/mips/mipsel/bits/endian.h index 5da5965..2241190 100644 --- a/sysdeps/mips/mipsel/bits/endian.h +++ b/sysdeps/mips/mipsel/bits/endian.h @@ -1,4 +1,8 @@ /* The MIPS architecture has selectable endianness. This file is for a machine using little-endian mode. */ +#ifndef _ENDIAN_H +# error "Never use directly; include instead." +#endif + #define __BYTE_ORDER __LITTLE_ENDIAN diff --git a/sysdeps/mips/p40/bits/endian.h b/sysdeps/mips/p40/bits/endian.h index e4b0119..f6cdde2 100644 --- a/sysdeps/mips/p40/bits/endian.h +++ b/sysdeps/mips/p40/bits/endian.h @@ -1,4 +1,8 @@ /* The MIPS has selectable endianness. The Japanese homebrew P40 architecture uses big-endian mode. */ +#ifndef _ENDIAN_H +# error "Never use directly; include instead." +#endif + #define __BYTE_ORDER __BIG_ENDIAN diff --git a/sysdeps/unix/bsd/osf/alpha/bits/stat.h b/sysdeps/unix/bsd/osf/alpha/bits/stat.h index ab0fa48..7084b4e 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 instead. - */ - -#ifndef _BITS_STAT_H -#define _BITS_STAT_H +#ifndef _SYS_STAT_H +# error "Never include directly; use instead." +#endif #include @@ -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 56e28a0..6bf0307 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 directly; use 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 61481cc..f637efa 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 directly; include 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 e1cdd41..29d2d87 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 directly; include 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 f51262d..6978c87 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 directly; include 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 /* For `struct timeval'. */ +#define __need_timeval +#include /* 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 dc0a007..15aaab7 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 directly; use 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 e9111b6..5a03bab 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 directly; use 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 ad4389a..a9f36ab 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 directly; use 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 72b29e5..cb66517 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 directly; include instead." +#endif + /* Note that ANY change to this instantly implies a change to __handler.S. */ struct sigcontext diff --git a/sysdeps/unix/sysv/irix4/bits/confname.h b/sysdeps/unix/sysv/irix4/bits/confname.h index c185f22..89fca07 100644 --- a/sysdeps/unix/sysv/irix4/bits/confname.h +++ b/sysdeps/unix/sysv/irix4/bits/confname.h @@ -17,6 +17,10 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifndef _UNISTD_H +# error "Never use directly; include instead." +#endif + /* Values for the NAME argument to `pathconf' and `fpathconf'. */ enum { diff --git a/sysdeps/unix/sysv/irix4/bits/stat.h b/sysdeps/unix/sysv/irix4/bits/stat.h index 0dab45c..633f261 100644 --- a/sysdeps/unix/sysv/irix4/bits/stat.h +++ b/sysdeps/unix/sysv/irix4/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 instead. - */ - -#ifndef _BITS_STAT_H -#define _BITS_STAT_H 1 +#ifndef _SYS_STAT_H +# error "Never include directly; use instead." +#endif struct stat { @@ -61,5 +58,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/sysv/linux/alpha/bits/ioctls.h b/sysdeps/unix/sysv/linux/alpha/bits/ioctls.h index 8a14f99..dcbf9f4 100644 --- a/sysdeps/unix/sysv/linux/alpha/bits/ioctls.h +++ b/sysdeps/unix/sysv/linux/alpha/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 instead. - */ - -#ifndef _BITS_IOCTLS_H -#define _BITS_IOCTLS_H 1 +#ifndef _SYS_IOCTL_H +# error "Never use directly; include instead." +#endif /* Use the definitions from the kernel header files. */ #include @@ -39,5 +36,3 @@ #define TCSETSF _IOW ('t', 22, struct __kernel_termios) #include - -#endif /* bits/ioctls.h */ diff --git a/sysdeps/unix/sysv/linux/alpha/bits/ipc.h b/sysdeps/unix/sysv/linux/alpha/bits/ipc.h index 57830da..ec116f6 100644 --- a/sysdeps/unix/sysv/linux/alpha/bits/ipc.h +++ b/sysdeps/unix/sysv/linux/alpha/bits/ipc.h @@ -1,6 +1,5 @@ /* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. This file is part of the GNU C Library. - Contributed by Ulrich Drepper , August 1995. 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,10 +16,9 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _SYS_IPC_BUF_H - -#define _SYS_IPC_BUF_H 1 -#include +#ifndef _SYS_IPC_H +# error "Never use directly; include instead." +#endif #include @@ -35,9 +33,6 @@ #define IPC_STAT 2 /* Get `ipc_perm' options. */ #define IPC_INFO 3 /* See ipcs. */ - -__BEGIN_DECLS - /* Special key values. */ #define IPC_PRIVATE ((__key_t) 0) /* Private key. */ @@ -63,10 +58,14 @@ struct ipc_kludge long int msgtyp; }; +__BEGIN_DECLS + /* The actual system call: all functions are multiplexed by this. */ extern int __ipc __P ((int __call, int __first, int __second, int __third, void *__ptr)); +__END_DECLS + /* The codes for the functions to use the multiplexer `__ipc'. */ #define IPCOP_semop 1 #define IPCOP_semget 2 @@ -79,7 +78,3 @@ extern int __ipc __P ((int __call, int __first, int __second, int __third, #define IPCOP_shmdt 22 #define IPCOP_shmget 23 #define IPCOP_shmctl 24 - -__END_DECLS - -#endif /* _SYS_IPC_BUF_H */ diff --git a/sysdeps/unix/sysv/linux/alpha/bits/mman.h b/sysdeps/unix/sysv/linux/alpha/bits/mman.h index 1bef0cb..081a004 100644 --- a/sysdeps/unix/sysv/linux/alpha/bits/mman.h +++ b/sysdeps/unix/sysv/linux/alpha/bits/mman.h @@ -1,4 +1,4 @@ -/* Definitions for POSIX memory map inerface. Linux/Alpha version. +/* Definitions for POSIX memory map interface. Linux/Alpha 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 instead" +# error "Never use directly; include instead." #endif /* The following definitions basically come from the kernel headers. diff --git a/sysdeps/unix/sysv/linux/alpha/bits/sigaction.h b/sysdeps/unix/sysv/linux/alpha/bits/sigaction.h index f28b6f2..274531f 100644 --- a/sysdeps/unix/sysv/linux/alpha/bits/sigaction.h +++ b/sysdeps/unix/sysv/linux/alpha/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 directly; use instead." +#endif + /* Structure describing the action to be taken when a signal arrives. */ struct sigaction { diff --git a/sysdeps/unix/sysv/linux/alpha/bits/stat.h b/sysdeps/unix/sysv/linux/alpha/bits/stat.h index de8752e..319ff96 100644 --- a/sysdeps/unix/sysv/linux/alpha/bits/stat.h +++ b/sysdeps/unix/sysv/linux/alpha/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 instead. - */ - -#ifndef _BITS_STAT_H -#define _BITS_STAT_H 1 +#ifndef _SYS_STAT_H +# error "Never include directly; use instead." +#endif /* Versions of the `struct stat' data structure. */ #define _STAT_VER_KERNEL 0 @@ -112,5 +109,3 @@ struct stat64 #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/sysv/linux/alpha/bits/termios.h b/sysdeps/unix/sysv/linux/alpha/bits/termios.h index d0932c1..0d57c48 100644 --- a/sysdeps/unix/sysv/linux/alpha/bits/termios.h +++ b/sysdeps/unix/sysv/linux/alpha/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 _TERMBITS_H -#define _TERMBITS_H 1 +#ifndef _TERMIOS_H +# error "Never include directly; use instead." +#endif typedef unsigned char cc_t; typedef unsigned int speed_t; @@ -189,5 +190,3 @@ struct termios #define _IOT_termios /* Hurd ioctl type field. */ \ _IOT (_IOTS (cflag_t), 4, _IOTS (cc_t), NCCS, _IOTS (speed_t), 2) - -#endif /* _TERMBITS_H */ diff --git a/sysdeps/unix/sysv/linux/alpha/bits/time.h b/sysdeps/unix/sysv/linux/alpha/bits/time.h index 7475b68..d32f4d3 100644 --- a/sysdeps/unix/sysv/linux/alpha/bits/time.h +++ b/sysdeps/unix/sysv/linux/alpha/bits/time.h @@ -21,23 +21,9 @@ * Never include this file directly; use instead. */ -#ifdef __need_timeval -# undef __need_timeval -# ifndef _STRUCT_TIMEVAL -# define _STRUCT_TIMEVAL 1 -/* A time value that is accurate to the nearest - microsecond but also has a range of years. */ -struct timeval - { - int tv_sec; /* Seconds. */ - int tv_usec; /* Microseconds. */ - }; -# endif /* struct timeval */ -#endif /* need timeval */ - - -#ifndef _BITS_TIME_H -#define _BITS_TIME_H 1 +#ifndef __need_timeval +# ifndef _BITS_TIME_H +# define _BITS_TIME_H 1 /* ISO/IEC 9899:1990 7.12.1: The macro `CLOCKS_PER_SEC' is the number per second of the value @@ -45,10 +31,23 @@ struct timeval /* CAE XSH, Issue 4, Version 2: The value of CLOCKS_PER_SEC is required to be 1 million on all XSI-conformant systems. */ -# define CLOCKS_PER_SEC 1000000 +# define CLOCKS_PER_SEC 1000000 /* Even though CLOCKS_PER_SEC has such a strange value CLK_TCK presents the real value for clock ticks per second for the system. */ -# define CLK_TCK 1024 +# define CLK_TCK 1024 -#endif /* bits/time.h */ +# endif /* bits/time.h */ +#endif /* !__need_timeval */ + + +#ifndef _STRUCT_TIMEVAL +# define _STRUCT_TIMEVAL 1 +/* A time value that is accurate to the nearest + microsecond but also has a range of years. */ +struct timeval + { + int tv_sec; /* Seconds. */ + int tv_usec; /* Microseconds. */ + }; +#endif /* struct timeval */ diff --git a/sysdeps/unix/sysv/linux/m68k/bits/mman.h b/sysdeps/unix/sysv/linux/m68k/bits/mman.h index d6c29d2..bca1dae 100644 --- a/sysdeps/unix/sysv/linux/m68k/bits/mman.h +++ b/sysdeps/unix/sysv/linux/m68k/bits/mman.h @@ -1,4 +1,4 @@ -/* Definitions for POSIX memory map inerface. Linux/m68k version. +/* Definitions for POSIX memory map interface. Linux/m68k 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 instead" +# error "Never use directly; include instead." #endif /* The following definitions basically come from the kernel headers. diff --git a/sysdeps/unix/sysv/linux/m68k/bits/poll.h b/sysdeps/unix/sysv/linux/m68k/bits/poll.h index 8fea439..2d4e6f6 100644 --- a/sysdeps/unix/sysv/linux/m68k/bits/poll.h +++ b/sysdeps/unix/sysv/linux/m68k/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 directly; include 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/mips/bits/endian.h b/sysdeps/unix/sysv/linux/mips/bits/endian.h index 9f60758..0a3d2fa 100644 --- a/sysdeps/unix/sysv/linux/mips/bits/endian.h +++ b/sysdeps/unix/sysv/linux/mips/bits/endian.h @@ -3,10 +3,14 @@ want to be able to share the installed headerfiles between both, so we define __BYTE_ORDER based on GCC's predefines. */ +#ifndef _ENDIAN_H +# error "Never use directly; include instead." +#endif + #ifdef __MIPSEB__ -#define __BYTE_ORDER __BIG_ENDIAN +# define __BYTE_ORDER __BIG_ENDIAN #else -#ifdef __MIPSEL__ -#define __BYTE_ORDER __LITTLE_ENDIAN -#endif +# ifdef __MIPSEL__ +# define __BYTE_ORDER __LITTLE_ENDIAN +# endif #endif diff --git a/sysdeps/unix/sysv/linux/mips/bits/ioctl-types.h b/sysdeps/unix/sysv/linux/mips/bits/ioctl-types.h index 486022e..4f5c2b0 100644 --- a/sysdeps/unix/sysv/linux/mips/bits/ioctl-types.h +++ b/sysdeps/unix/sysv/linux/mips/bits/ioctl-types.h @@ -17,12 +17,9 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - * Never include this file directly; use instead. - */ - -#ifndef _BITS_IOCTL_TYPES_H -#define _BITS_IOCTL_TYPES_H 1 +#ifndef _SYS_IOCTL_H +# error "Never use directly; include instead." +#endif /* Get definition of constants for use with `ioctl'. */ #include @@ -67,5 +64,3 @@ struct termio #define N_PPP 3 #define N_STRIP 4 #define N_AX25 5 - -#endif /* bits/ioctl-types.h */ diff --git a/sysdeps/unix/sysv/linux/mips/bits/ipc.h b/sysdeps/unix/sysv/linux/mips/bits/ipc.h index c5a3cd0..2841e6a 100644 --- a/sysdeps/unix/sysv/linux/mips/bits/ipc.h +++ b/sysdeps/unix/sysv/linux/mips/bits/ipc.h @@ -1,6 +1,5 @@ /* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. This file is part of the GNU C Library. - Contributed by Ulrich Drepper , August 1995. 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,10 +16,9 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _SYS_IPC_BUF_H - -#define _SYS_IPC_BUF_H 1 -#include +#ifndef _SYS_IPC_H +# error "Never use directly; include instead." +#endif #include @@ -36,8 +34,6 @@ #define IPC_INFO 3 /* See ipcs. */ -__BEGIN_DECLS - /* Special key values. */ #define IPC_PRIVATE ((__key_t) 0) /* Private key. */ @@ -46,11 +42,11 @@ __BEGIN_DECLS struct ipc_perm { __key_t __key; /* Key. */ - long uid; /* Owner's user ID. */ - long gid; /* Owner's group ID. */ - long cuid; /* Creator's user ID. */ - long cgid; /* Creator's group ID. */ - unsigned long mode; /* Read/write permission. */ + long int uid; /* Owner's user ID. */ + long int gid; /* Owner's group ID. */ + long int cuid; /* Creator's user ID. */ + long int cgid; /* Creator's group ID. */ + unsigned long int mode; /* Read/write permission. */ unsigned short int __seq; /* Sequence number. */ }; @@ -63,10 +59,14 @@ struct ipc_kludge long int msgtyp; }; +__BEGIN_DECLS + /* The actual system call: all functions are multiplexed by this. */ extern int __ipc __P ((int __call, int __first, int __second, int __third, void *__ptr)); +__END_DECLS + /* The codes for the functions to use the multiplexer `__ipc'. */ #define IPCOP_semop 1 #define IPCOP_semget 2 @@ -79,7 +79,3 @@ extern int __ipc __P ((int __call, int __first, int __second, int __third, #define IPCOP_shmdt 22 #define IPCOP_shmget 23 #define IPCOP_shmctl 24 - -__END_DECLS - -#endif /* bits/ipc_buf.h */ diff --git a/sysdeps/unix/sysv/linux/mips/bits/mman.h b/sysdeps/unix/sysv/linux/mips/bits/mman.h index 15a343f..be460ab 100644 --- a/sysdeps/unix/sysv/linux/mips/bits/mman.h +++ b/sysdeps/unix/sysv/linux/mips/bits/mman.h @@ -1,4 +1,4 @@ -/* Definitions for POSIX memory map inerface. Linux/PowerPC version. +/* Definitions for POSIX memory map interface. Linux/PowerPC 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 instead" +# error "Never use directly; include instead." #endif /* The following definitions basically come from the kernel headers. diff --git a/sysdeps/unix/sysv/linux/mips/bits/poll.h b/sysdeps/unix/sysv/linux/mips/bits/poll.h index c1c9a6b..9b7826a 100644 --- a/sysdeps/unix/sysv/linux/mips/bits/poll.h +++ b/sysdeps/unix/sysv/linux/mips/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 directly; include 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/mips/bits/shm.h b/sysdeps/unix/sysv/linux/mips/bits/shm.h index 9d4b20b..20e75e0 100644 --- a/sysdeps/unix/sysv/linux/mips/bits/shm.h +++ b/sysdeps/unix/sysv/linux/mips/bits/shm.h @@ -1,6 +1,5 @@ /* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. This file is part of the GNU C Library. - Contributed by Ulrich Drepper , August 1995. 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,10 +16,9 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _SYS_SHM_BUF_H - -#define _SYS_SHM_BUF_H 1 -#include +#ifndef _SYS_SHM_H +# error "Never include directly; use instead." +#endif #include @@ -38,55 +36,49 @@ #define SHM_UNLOCK 12 /* unlock segment (root only) */ -__BEGIN_DECLS - /* Data structure describing a set of semaphores. */ struct shmid_ds -{ - struct ipc_perm shm_perm; /* operation permission struct */ - int shm_segsz; /* size of segment in bytes */ - __time_t shm_atime; /* time of last shmat() */ - __time_t shm_dtime; /* time of last shmdt() */ - __time_t shm_ctime; /* time of last change by shmctl() */ - long shm_cpid; /* pid of creator */ - long shm_lpid; /* pid of last shmop */ - unsigned short int shm_nattch; /* number of current attaches */ - unsigned short int __shm_npages; /* size of segment (pages) */ - unsigned long int *__shm_pages; /* array of ptrs to frames -> SHMMAX */ - struct vm_area_struct *__attaches; /* descriptors for attaches */ -}; + { + struct ipc_perm shm_perm; /* operation permission struct */ + int shm_segsz; /* size of segment in bytes */ + __time_t shm_atime; /* time of last shmat() */ + __time_t shm_dtime; /* time of last shmdt() */ + __time_t shm_ctime; /* time of last change by shmctl() */ + long int shm_cpid; /* pid of creator */ + long int shm_lpid; /* pid of last shmop */ + unsigned short int shm_nattch; /* number of current attaches */ + unsigned short int __shm_npages; /* size of segment (pages) */ + unsigned long int *__shm_pages; /* array of ptrs to frames -> SHMMAX */ + struct vm_area_struct *__attaches; /* descriptors for attaches */ + }; #ifdef __USE_MISC /* ipcs ctl commands */ -#define SHM_STAT 13 -#define SHM_INFO 14 +# define SHM_STAT 13 +# define SHM_INFO 14 /* shm_mode upper byte flags */ -#define SHM_DEST 01000 /* segment will be destroyed on last detach */ -#define SHM_LOCKED 02000 /* segment will not be swapped */ +# define SHM_DEST 01000 /* segment will be destroyed on last detach */ +# define SHM_LOCKED 02000 /* segment will not be swapped */ struct shminfo -{ - int shmmax; - int shmmin; - int shmmni; - int shmseg; - int shmall; -}; + { + int shmmax; + int shmmin; + int shmmni; + int shmseg; + int shmall; + }; struct shm_info -{ - int used_ids; - ulong shm_tot; /* total allocated shm */ - ulong shm_rss; /* total resident shm */ - ulong shm_swp; /* total swapped shm */ - ulong swap_attempts; - ulong swap_successes; -}; + { + int used_ids; + ulong shm_tot; /* total allocated shm */ + ulong shm_rss; /* total resident shm */ + ulong shm_swp; /* total swapped shm */ + ulong swap_attempts; + ulong swap_successes; + }; #endif /* __USE_MISC */ - -__END_DECLS - -#endif /* bits/shm_buf.h */ diff --git a/sysdeps/unix/sysv/linux/mips/bits/sigaction.h b/sysdeps/unix/sysv/linux/mips/bits/sigaction.h index d6f70f2..71ca884 100644 --- a/sysdeps/unix/sysv/linux/mips/bits/sigaction.h +++ b/sysdeps/unix/sysv/linux/mips/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 directly; use instead." +#endif + /* Structure describing the action to be taken when a signal arrives. */ struct sigaction { @@ -33,7 +37,7 @@ struct sigaction /* Restore handler. */ void (*sa_restorer) __P ((void)); -#if (_MIPS_ISA == _MIPS_ISA_MIPS1) || (_MIPS_ISA == _MIPS_ISA_MIPS2) +#if _MIPS_ISA == _MIPS_ISA_MIPS1 || _MIPS_ISA == _MIPS_ISA_MIPS2 int sa_resv[1]; #endif }; diff --git a/sysdeps/unix/sysv/linux/mips/bits/socket.h b/sysdeps/unix/sysv/linux/mips/bits/socket.h index 02f1d22..f56f626 100644 --- a/sysdeps/unix/sysv/linux/mips/bits/socket.h +++ b/sysdeps/unix/sysv/linux/mips/bits/socket.h @@ -17,19 +17,14 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _SYS_SOCKET_H -#error "Never include directly; use instead." +#ifndef _SYS_STAT_H +# error "Never include directly; use instead." #endif - -#include - #define __need_size_t #define __need_NULL #include -__BEGIN_DECLS - /* Type for length arguments in socket calls. */ typedef unsigned int socklen_t; @@ -173,5 +168,3 @@ struct linger int l_onoff; /* Nonzero to linger on close. */ int l_linger; /* Time to linger. */ }; - -__END_DECLS diff --git a/sysdeps/unix/sysv/linux/mips/bits/stat.h b/sysdeps/unix/sysv/linux/mips/bits/stat.h index f27a75e..cd586d4 100644 --- a/sysdeps/unix/sysv/linux/mips/bits/stat.h +++ b/sysdeps/unix/sysv/linux/mips/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 instead. - */ - -#ifndef _BITS_STAT_H -#define _BITS_STAT_H 1 +#ifndef _SYS_STAT_H +# error "Never include directly; use instead." +#endif /* Versions of the `struct stat' data structure. */ #define _STAT_VER_LINUX_OLD 1 @@ -140,5 +137,3 @@ struct stat64 #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/sysv/linux/mips/bits/statfs.h b/sysdeps/unix/sysv/linux/mips/bits/statfs.h index 2727b27..36d9996 100644 --- a/sysdeps/unix/sysv/linux/mips/bits/statfs.h +++ b/sysdeps/unix/sysv/linux/mips/bits/statfs.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 instead. - */ - -#ifndef _BITS_STATFS_H -#define _BITS_STATFS_H +#ifndef _SYS_STATFS_H +# error "Never include directly; use instead." +#endif #include /* for __fsid_t and __fsblkcnt_t*/ @@ -70,5 +67,3 @@ struct statfs64 long int f_spare[6]; }; #endif - -#endif /* bits/statfs.h */ diff --git a/sysdeps/unix/sysv/linux/mips/bits/termios.h b/sysdeps/unix/sysv/linux/mips/bits/termios.h index c8a2469..de21ee1 100644 --- a/sysdeps/unix/sysv/linux/mips/bits/termios.h +++ b/sysdeps/unix/sysv/linux/mips/bits/termios.h @@ -17,20 +17,16 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* - * Never include this file directly; use instead. - */ - - -#ifndef _BITS_TERMIOS_H -#define _BITS_TERMIOS_H 1 +#ifndef _TERMIOS_H +# error "Never include directly; use instead." +#endif typedef unsigned char cc_t; typedef unsigned int speed_t; typedef unsigned int tcflag_t; -#if defined __USE_BSD +#ifdef __USE_BSD struct sgttyb { @@ -83,10 +79,10 @@ struct termios #define VKILL 3 /* Kill-line character [ICANON]. */ #define VMIN 4 /* Minimum number of bytes read at once [!ICANON]. */ #define VTIME 5 /* Time-out value (tenths of a second) [!ICANON]. */ -#if defined (__USE_BSD) -#define VEOL2 6 /* Second EOL character [ICANON]. */ +#ifdef __USE_BSD +# define VEOL2 6 /* Second EOL character [ICANON]. */ /* The next two are guesses ... */ -#define VSWTC 7 /* ??? */ +# define VSWTC 7 /* ??? */ #endif #define VSWTCH VSWTC #define VSTART 8 /* Start (X-ON) character [IXON, IXOFF]. */ @@ -96,17 +92,17 @@ struct termios /* * VDSUSP is not supported */ -#if defined (__USE_BSD) +#if defined __USE_BSD #define VDSUSP 11 /* Delayed suspend character [ISIG]. */ #endif #endif -#if defined (__USE_BSD) -#define VREPRINT 12 /* Reprint-line character [ICANON]. */ +#ifdef __USE_BSD +# define VREPRINT 12 /* Reprint-line character [ICANON]. */ #endif -#if defined (__USE_BSD) -#define VDISCARD 13 /* Discard character [IEXTEN]. */ -#define VWERASE 14 /* Word-erase character [ICANON]. */ -#define VLNEXT 15 /* Literal-next character [IEXTEN]. */ +#ifdef __USE_BSD +# define VDISCARD 13 /* Discard character [IEXTEN]. */ +# define VWERASE 14 /* Word-erase character [ICANON]. */ +# define VLNEXT 15 /* Literal-next character [IEXTEN]. */ #endif #define VEOF 16 /* End-of-file character [ICANON]. */ #define VEOL 17 /* End-of-line character [ICANON]. */ @@ -121,51 +117,51 @@ struct termios #define INLCR 0000100 /* Map NL to CR on input. */ #define IGNCR 0000200 /* Ignore CR. */ #define ICRNL 0000400 /* Map CR to NL on input. */ -#if defined (__USE_BSD) -#define IUCLC 0001000 /* Map upper case to lower case on input. */ +#ifdef __USE_BSD +# define IUCLC 0001000 /* Map upper case to lower case on input. */ #endif #define IXON 0002000 /* Enable start/stop output control. */ -#if defined (__USE_BSD) -#define IXANY 0004000 /* Any character will restart after stop. */ +#ifdef __USE_BSD +# define IXANY 0004000 /* Any character will restart after stop. */ #endif #define IXOFF 0010000 /* Enable start/stop input control. */ -#if defined (__USE_BSD) -#define IMAXBEL 0020000 /* Ring bell when input queue is full. */ +#ifdef __USE_BSD +# define IMAXBEL 0020000 /* Ring bell when input queue is full. */ #endif /* c_oflag bits */ #define OPOST 0000001 /* Perform output processing. */ -#if defined (__USE_BSD) -#define OLCUC 0000002 /* Map lower case to upper case on output. */ -#define ONLCR 0000004 /* Map NL to CR-NL on output. */ -#define OCRNL 0000010 -#define ONOCR 0000020 -#define ONLRET 0000040 -#define OFILL 0000100 -#define OFDEL 0000200 -#define NLDLY 0000400 -#define NL0 0000000 -#define NL1 0000400 -#define CRDLY 0003000 -#define CR0 0000000 -#define CR1 0001000 -#define CR2 0002000 -#define CR3 0003000 -#define TABDLY 0014000 -#define TAB0 0000000 -#define TAB1 0004000 -#define TAB2 0010000 -#define TAB3 0014000 -#define XTABS 0014000 -#define BSDLY 0020000 -#define BS0 0000000 -#define BS1 0020000 -#define VTDLY 0040000 -#define VT0 0000000 -#define VT1 0040000 -#define FFDLY 0100000 -#define FF0 0000000 -#define FF1 0100000 +#ifdef __USE_BSD +# define OLCUC 0000002 /* Map lower case to upper case on output. */ +# define ONLCR 0000004 /* Map NL to CR-NL on output. */ +# define OCRNL 0000010 +# define ONOCR 0000020 +# define ONLRET 0000040 +# define OFILL 0000100 +# define OFDEL 0000200 +# define NLDLY 0000400 +# define NL0 0000000 +# define NL1 0000400 +# define CRDLY 0003000 +# define CR0 0000000 +# define CR1 0001000 +# define CR2 0002000 +# define CR3 0003000 +# define TABDLY 0014000 +# define TAB0 0000000 +# define TAB1 0004000 +# define TAB2 0010000 +# define TAB3 0014000 +# define XTABS 0014000 +# define BSDLY 0020000 +# define BS0 0000000 +# define BS1 0020000 +# define VTDLY 0040000 +# define VT0 0000000 +# define VT1 0040000 +# define FFDLY 0100000 +# define FF0 0000000 +# define FF1 0100000 /* #define PAGEOUT ??? #define WRAP ??? @@ -203,14 +199,14 @@ struct termios #define PARODD 0001000 /* Odd parity instead of even. */ #define HUPCL 0002000 /* Hang up on last close. */ #define CLOCAL 0004000 /* Ignore modem status lines. */ -#if defined (__USE_BSD) -#define CBAUDEX 0010000 -#define B57600 0010001 -#define B115200 0010002 -#define B230400 0010003 -#define B460800 0010004 -#define CIBAUD 002003600000 /* input baud rate (not used) */ -#define CRTSCTS 020000000000 /* flow control */ +#ifdef __USE_BSD +# define CBAUDEX 0010000 +# define B57600 0010001 +# define B115200 0010002 +# define B230400 0010003 +# define B460800 0010004 +# define CIBAUD 002003600000 /* input baud rate (not used) */ +# define CRTSCTS 020000000000 /* flow control */ #endif /* c_lflag bits */ @@ -223,14 +219,14 @@ struct termios #define ECHONL 0000100 /* Echo NL even if ECHO is off. */ #define NOFLSH 0000200 /* Disable flush after interrupt. */ #define IEXTEN 0000400 /* Enable DISCARD and LNEXT. */ -#if defined (__USE_BSD) -#define ECHOCTL 0001000 /* Echo control characters as ^X. */ -#define ECHOPRT 0002000 /* Hardcopy visual erase. */ -#define ECHOKE 0004000 /* Visual erase for KILL. */ +#ifdef __USE_BSD +# define ECHOCTL 0001000 /* Echo control characters as ^X. */ +# define ECHOPRT 0002000 /* Hardcopy visual erase. */ +# define ECHOKE 0004000 /* Visual erase for KILL. */ #endif #define FLUSHO 0020000 -#if defined (__USE_BSD) -#define PENDIN 0040000 /* Retype pending input (state). */ +#ifdef __USE_BSD +# define PENDIN 0040000 /* Retype pending input (state). */ #endif #define TOSTOP 0100000 /* Send SIGTTOU for background output. */ #define ITOSTOP TOSTOP @@ -256,5 +252,3 @@ struct termios #define _IOT_termios /* Hurd ioctl type field. */ \ _IOT (_IOTS (cflag_t), 4, _IOTS (cc_t), NCCS, _IOTS (speed_t), 2) - -#endif /* bits/termios.h */ diff --git a/sysdeps/unix/sysv/linux/mips/bits/time.h b/sysdeps/unix/sysv/linux/mips/bits/time.h index 5fcef0f..a7b268d 100644 --- a/sysdeps/unix/sysv/linux/mips/bits/time.h +++ b/sysdeps/unix/sysv/linux/mips/bits/time.h @@ -21,23 +21,9 @@ * Never include this file directly; use instead. */ -#ifdef __need_timeval -# undef __need_timeval -# ifndef _STRUCT_TIMEVAL -# define _STRUCT_TIMEVAL 1 -/* A time value that is accurate to the nearest - microsecond but also has a range of years. */ -struct timeval - { - long tv_sec; /* Seconds. */ - long tv_usec; /* Microseconds. */ - }; -# endif /* struct timeval */ -#endif /* need timeval */ - - -#ifndef _BITS_TIME_H -#define _BITS_TIME_H 1 +#ifndef __need_timeval +# ifndef _BITS_TIME_H +# define _BITS_TIME_H 1 /* ISO/IEC 9899:1990 7.12.1: The macro `CLOCKS_PER_SEC' is the number per second of the value @@ -45,10 +31,22 @@ struct timeval /* CAE XSH, Issue 4, Version 2: The value of CLOCKS_PER_SEC is required to be 1 million on all XSI-conformant systems. */ -# define CLOCKS_PER_SEC 1000000 +# define CLOCKS_PER_SEC 1000000 /* Even though CLOCKS_PER_SEC has such a strange value CLK_TCK presents the real value for clock ticks per second for the system. */ -# define CLK_TCK 100 /* XXX not correct for all systems. */ +# define CLK_TCK 100 /* XXX not correct for all systems. */ -#endif /* bits/time.h */ +# endif /* bits/time.h */ +#endif + +#ifndef _STRUCT_TIMEVAL +# define _STRUCT_TIMEVAL 1 +/* A time value that is accurate to the nearest + microsecond but also has a range of years. */ +struct timeval + { + long int tv_sec; /* Seconds. */ + long int tv_usec; /* Microseconds. */ + }; +#endif /* struct timeval */ diff --git a/sysdeps/unix/sysv/minix/bits/sigaction.h b/sysdeps/unix/sysv/minix/bits/sigaction.h index 732befc..96f14d1 100644 --- a/sysdeps/unix/sysv/minix/bits/sigaction.h +++ b/sysdeps/unix/sysv/minix/bits/sigaction.h @@ -16,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 include directly; use instead." +#endif + /* Structure describing the action to be taken when a signal arrives. */ struct sigaction { diff --git a/sysdeps/unix/sysv/sco3.2.4/bits/confname.h b/sysdeps/unix/sysv/sco3.2.4/bits/confname.h index 3af9377..3c549dd 100644 --- a/sysdeps/unix/sysv/sco3.2.4/bits/confname.h +++ b/sysdeps/unix/sysv/sco3.2.4/bits/confname.h @@ -17,6 +17,10 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifndef _UNISTD_H +# error "Never use directly; include instead." +#endif + /* Values for the NAME argument to `pathconf' and `fpathconf'. */ #define _PC_LINK_MAX 0 #define _PC_MAX_CANON 1 diff --git a/sysdeps/unix/sysv/sco3.2.4/bits/sigaction.h b/sysdeps/unix/sysv/sco3.2.4/bits/sigaction.h index f66877d..eaa52be 100644 --- a/sysdeps/unix/sysv/sco3.2.4/bits/sigaction.h +++ b/sysdeps/unix/sysv/sco3.2.4/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 directly; use instead." +#endif + /* Structure describing the action to be taken when a signal arrives. */ struct sigaction { diff --git a/sysdeps/unix/sysv/sysv4/bits/sigaction.h b/sysdeps/unix/sysv/sysv4/bits/sigaction.h index ce3ab5e..07d5554 100644 --- a/sysdeps/unix/sysv/sysv4/bits/sigaction.h +++ b/sysdeps/unix/sysv/sysv4/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 directly; use instead." +#endif + /* Structure describing the action to be taken when a signal arrives. */ struct sigaction { diff --git a/sysdeps/unix/sysv/sysv4/bits/utsname.h b/sysdeps/unix/sysv/sysv4/bits/utsname.h index 9dcc618..bf2c0a8 100644 --- a/sysdeps/unix/sysv/sysv4/bits/utsname.h +++ b/sysdeps/unix/sysv/sysv4/bits/utsname.h @@ -1 +1,23 @@ +/* Copyright (C) 1995, 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 + 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 directly; use instead." +#endif + #define _UTSNAME_LENGTH 257 diff --git a/sysdeps/unix/sysv/sysv4/bits/waitflags.h b/sysdeps/unix/sysv/sysv4/bits/waitflags.h index 29ff566..e99dc00 100644 --- a/sysdeps/unix/sysv/sysv4/bits/waitflags.h +++ b/sysdeps/unix/sysv/sysv4/bits/waitflags.h @@ -19,7 +19,7 @@ Boston, MA 02111-1307, USA. */ #ifndef _SYS_WAIT_H -#error "Never use directly; include instead." +# error "Never include directly; use instead." #endif @@ -28,7 +28,7 @@ #define WUNTRACED 4 /* Report status of stopped children. */ #ifdef __USE_SVID -#define WEXITED 1 /* Look for children that have exited. */ -#define WTRAPPED 2 /* Look for processes that stopped +# define WEXITED 1 /* Look for children that have exited. */ +# define WTRAPPED 2 /* Look for processes that stopped while tracing. */ #endif diff --git a/sysdeps/unix/sysv/sysv4/i386/bits/stat.h b/sysdeps/unix/sysv/sysv4/i386/bits/stat.h index f3f4473..104ad2f 100644 --- a/sysdeps/unix/sysv/sysv4/i386/bits/stat.h +++ b/sysdeps/unix/sysv/sysv4/i386/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 instead. - */ - -#ifndef _BITS_STAT_H -#define _BITS_STAT_H 1 +#ifndef _SYS_STAT_H +# error "Never include directly; use instead." +#endif #include @@ -34,37 +30,37 @@ /* Structure describing file characteristics. */ struct stat { - unsigned long st_dev; /* Device. */ - long st_filler1[3]; - unsigned long st_ino; /* File serial number. */ - unsigned long st_mode; /* File mode. */ - unsigned long st_nlink; /* Link count. */ - long st_uid; /* User ID of the file's owner. */ - long st_gid; /* Group ID of the file's group.*/ - unsigned long st_rdev; /* Device number, if device. */ - long st_filler2[2]; - - long st_size; /* Size of file, in bytes. */ + unsigned long itn st_dev; /* Device. */ + long int st_filler1[3]; + unsigned long int st_ino; /* File serial number. */ + unsigned long int st_mode; /* File mode. */ + unsigned long int st_nlink; /* Link count. */ + long int st_uid; /* User ID of the file's owner. */ + long int st_gid; /* Group ID of the file's group.*/ + unsigned long int st_rdev; /* Device number, if device. */ + long int st_filler2[2]; + + long int st_size; /* Size of file, in bytes. */ /* SVR4 added this extra long to allow for expansion of off_t. */ - long st_filler3; + long int st_filler3; - long st_atime; /* Time of last access. */ - unsigned long st_atime_usec; - long st_mtime; /* Time of last modification. */ - unsigned long st_mtime_usec; - long st_ctime; /* Time of last status change. */ - unsigned long st_ctime_usec; + long int st_atime; /* Time of last access. */ + unsigned long int st_atime_usec; + long int st_mtime; /* Time of last modification. */ + unsigned long int st_mtime_usec; + long int st_ctime; /* Time of last status change. */ + unsigned long int st_ctime_usec; - long st_blksize; /* Optimal block size for I/O. */ + long int st_blksize; /* Optimal block size for I/O. */ #define _STATBUF_ST_BLKSIZE /* Tell code we have this member. */ __blkcnt_t st_blocks; /* Number of 512-byte blocks allocated. */ char st_fstype[16]; /* The type of this filesystem. */ int st_aclcnt; - unsigned long st_level; - unsigned long st_flags; - unsigned long st_cmwlevel; - long st_filler4[4]; + unsigned long int st_level; + unsigned long int st_flags; + unsigned long int st_cmwlevel; + long int st_filler4[4]; }; /* Encoding of the file mode. */ @@ -90,5 +86,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/sysv/sysv4/solaris2/bits/stat.h b/sysdeps/unix/sysv/sysv4/solaris2/bits/stat.h index 82ab37f..c6048a9 100644 --- a/sysdeps/unix/sysv/sysv4/solaris2/bits/stat.h +++ b/sysdeps/unix/sysv/sysv4/solaris2/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 instead. - */ - -#ifndef _BITS_STAT_H -#define _BITS_STAT_H 1 +#ifndef _SYS_STAT_H +# error "Never include directly; use instead." +#endif #include @@ -30,7 +26,7 @@ struct stat { unsigned long int st_dev; - long st_filler1[3]; + long int st_filler1[3]; __ino_t st_ino; /* File serial number. */ unsigned long int st_mode; /* File mode. */ /* This is unsigned long instead of __nlink_t, since SVR4 has @@ -39,11 +35,11 @@ struct stat __uid_t st_uid; /* User ID of the file's owner. */ __gid_t st_gid; /* Group ID of the file's group.*/ unsigned long int st_rdev; /* Device number, if device. */ - long st_filler2[2]; + long int st_filler2[2]; __off_t st_size; /* Size of file, in bytes. */ /* SVR4 added this extra long to allow for expansion of off_t. */ - long st_filler3; + long int st_filler3; __time_t st_atime; /* Time of last access. */ unsigned long int st_atime_usec; @@ -55,9 +51,9 @@ struct stat __blkcnt_t st_blksize; /* Optimal block size for I/O. */ #define _STATBUF_ST_BLKSIZE /* Tell code we have this member. */ - long st_blocks; /* Number of 512-byte blocks allocated. */ + long int st_blocks; /* Number of 512-byte blocks allocated. */ char st_fstype[16]; - long st_filler4[8]; + long int st_filler4[8]; }; /* Encoding of the file mode. */ @@ -83,5 +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/sysv/sysv4/solaris2/sparc/bits/sigcontext.h b/sysdeps/unix/sysv/sysv4/solaris2/sparc/bits/sigcontext.h index 7402704..29d2d87 100644 --- a/sysdeps/unix/sysv/sysv4/solaris2/sparc/bits/sigcontext.h +++ b/sysdeps/unix/sysv/sysv4/solaris2/sparc/bits/sigcontext.h @@ -1 +1,34 @@ -#include +/* Structure describing state saved while handling a signal. Sparc version. + Copyright (C) 1992, 1994, 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 _SIGNAL_H +# error "Never use directly; include instead." +#endif + +struct sigcontext + { + int sc_onstack; + __sigset_t sc_mask; + +#define SPARC_MAXREGWINDOW 31 /* Maximum usable register windows. */ + int sc_sp, sc_pc, sc_npc, sc_psr, sc_g1, sc_o0; + int sc_wbcnt; /* Number of outstanding windows. */ + __ptr_t sc_spbuf[SPARC_MAXREGWINDOW]; /* SP's for each window. */ + int sc_wbuf[SPARC_MAXREGWINDOW][16]; /* Saved register windows. */ + }; diff --git a/sysdeps/vax/bits/huge_val.h b/sysdeps/vax/bits/huge_val.h index f323049..74930be 100644 --- a/sysdeps/vax/bits/huge_val.h +++ b/sysdeps/vax/bits/huge_val.h @@ -1,6 +1,6 @@ /* `HUGE_VAL' constant for Vaxen. Used by and functions for overflow. - Copyright (C) 1992, 1996 Free Software Foundation, Inc. + Copyright (C) 1992, 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 @@ -19,7 +19,7 @@ Boston, MA 02111-1307, USA. */ #ifndef _MATH_H -#error "Never use directly; include instead." +# error "Never use directly; include instead." #endif diff --git a/sysdeps/vax/bits/setjmp.h b/sysdeps/vax/bits/setjmp.h index 7adecd9..10ca170 100644 --- a/sysdeps/vax/bits/setjmp.h +++ b/sysdeps/vax/bits/setjmp.h @@ -1,5 +1,9 @@ /* Define the machine-dependent type `jmp_buf'. Vax version. */ +#ifndef _SETJMP_H +# error "Never include directly; use instead." +#endif + typedef struct { PTR __fp;