diff options
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/Makefile | 10 | ||||
| -rw-r--r-- | misc/ar.h | 2 | ||||
| -rw-r--r-- | misc/bits/stab.def (renamed from misc/stab.def) | 0 | ||||
| -rw-r--r-- | misc/err.h | 5 | ||||
| -rw-r--r-- | misc/error.h | 6 | ||||
| -rw-r--r-- | misc/fstab.h | 6 | ||||
| -rw-r--r-- | misc/libgen.h | 2 | ||||
| -rw-r--r-- | misc/nlist.h | 2 | ||||
| -rw-r--r-- | misc/sgtty.h | 3 | ||||
| -rw-r--r-- | misc/stab.h | 2 | ||||
| -rw-r--r-- | misc/sys/cdefs.h | 2 | ||||
| -rw-r--r-- | misc/sys/dir.h | 2 | ||||
| -rw-r--r-- | misc/sys/file.h | 2 | ||||
| -rw-r--r-- | misc/sys/ioctl.h | 16 | ||||
| -rw-r--r-- | misc/sys/queue.h | 6 | ||||
| -rw-r--r-- | misc/sys/select.h | 6 | ||||
| -rw-r--r-- | misc/sys/syslog.h | 5 | ||||
| -rw-r--r-- | misc/sys/uio.h | 4 | ||||
| -rw-r--r-- | misc/sys/ustat.h | 10 | ||||
| -rw-r--r-- | misc/sysexits.h | 6 | ||||
| -rw-r--r-- | misc/syslog.c | 2 | ||||
| -rw-r--r-- | misc/ttyent.h | 6 |
22 files changed, 57 insertions, 48 deletions
diff --git a/misc/Makefile b/misc/Makefile index e2db14daa0..4cca2f32c1 100644 --- a/misc/Makefile +++ b/misc/Makefile @@ -22,14 +22,14 @@ subdir := misc -headers := sys/uio.h iovec.h sys/ioctl.h ioctls.h ioctl-types.h \ +headers := sys/uio.h bits/uio.h sys/ioctl.h bits/ioctls.h bits/ioctl-types.h \ sys/ptrace.h sys/file.h sys/dir.h sys/cdefs.h \ - ar.h a.out.h libgen.h stab.h stab.def sgtty.h \ + ar.h a.out.h libgen.h stab.h bits/stab.def sgtty.h \ ttyent.h syslog.h sys/syslog.h paths.h sys/reboot.h \ - sys/mman.h sys/param.h fstab.h mntent.h search.h err.h error.h\ + sys/mman.h sys/param.h fstab.h mntent.h search.h err.h error.h \ sys/queue.h sysexits.h syscall.h sys/syscall.h sys/swap.h \ - sys/select.h ustat.h sys/ustat.h ustatbits.h sys/sysinfo.h \ - regexp.h selectbits.h + sys/select.h ustat.h sys/ustat.h bits/ustat.h sys/sysinfo.h \ + regexp.h bits/select.h routines := brk sbrk sstk ioctl \ readv writev \ @@ -18,8 +18,8 @@ Boston, MA 02111-1307, USA. */ #ifndef _AR_H - #define _AR_H 1 + #include <sys/cdefs.h> /* Archive files start with the ARMAG identifying string. Then follows a diff --git a/misc/stab.def b/misc/bits/stab.def index dd4fbf0e8b..dd4fbf0e8b 100644 --- a/misc/stab.def +++ b/misc/bits/stab.def diff --git a/misc/err.h b/misc/err.h index 403ef7f701..fa971cabf0 100644 --- a/misc/err.h +++ b/misc/err.h @@ -17,8 +17,9 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _ERR_H_ -#define _ERR_H_ 1 +#ifndef _ERR_H +#define _ERR_H 1 + #include <features.h> #define __need___va_list diff --git a/misc/error.h b/misc/error.h index 25784c22ce..0d3bcb7ae3 100644 --- a/misc/error.h +++ b/misc/error.h @@ -19,8 +19,8 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _error_h_ -#define _error_h_ +#ifndef _ERROR_H +#define _ERROR_H 1 #ifndef __attribute__ /* This feature is available in gcc versions 2.5 and later. */ @@ -74,4 +74,4 @@ extern int error_one_per_line; } #endif -#endif /* _error_h_ */ +#endif /* error.h */ diff --git a/misc/fstab.h b/misc/fstab.h index d45ce62d2b..d2e27d9711 100644 --- a/misc/fstab.h +++ b/misc/fstab.h @@ -33,9 +33,9 @@ * @(#)fstab.h 8.1 (Berkeley) 6/2/93 */ -#ifndef _FSTAB_H_ +#ifndef _FSTAB_H +#define _FSTAB_H 1 -#define _FSTAB_H_ 1 #include <features.h> /* @@ -79,4 +79,4 @@ extern void endfsent __P ((void)); __END_DECLS -#endif /* !_FSTAB_H_ */ +#endif /* fstab.h */ diff --git a/misc/libgen.h b/misc/libgen.h index 4eb4d15ff8..87c9d3f967 100644 --- a/misc/libgen.h +++ b/misc/libgen.h @@ -17,8 +17,8 @@ Boston, MA 02111-1307, USA. */ #ifndef _LIBGEN_H - #define _LIBGEN_H 1 + #include <sys/cdefs.h> __BEGIN_DECLS diff --git a/misc/nlist.h b/misc/nlist.h index 7e2ebc01e7..53cd468658 100644 --- a/misc/nlist.h +++ b/misc/nlist.h @@ -17,8 +17,8 @@ Boston, MA 02111-1307, USA. */ #ifndef _NLIST_H - #define _NLIST_H 1 + #include <features.h> __BEGIN_DECLS diff --git a/misc/sgtty.h b/misc/sgtty.h index c232dfc823..86e15b0afc 100644 --- a/misc/sgtty.h +++ b/misc/sgtty.h @@ -18,11 +18,12 @@ #ifndef _SGTTY_H #define _SGTYY_H 1 + #include <features.h> #include <sys/ioctl.h> -/* On some systems this type is not defined by <ioctl-types.h>; +/* On some systems this type is not defined by <bits/ioctl-types.h>; in that case, the functions are just stubs that return ENOSYS. */ struct sgttyb; diff --git a/misc/stab.h b/misc/stab.h index 80bd594a36..9dc3c32ecb 100644 --- a/misc/stab.h +++ b/misc/stab.h @@ -8,7 +8,7 @@ enum __stab_debug_code { -#include "stab.def" +#include <bits/stab.def> LAST_UNUSED_STAB_CODE }; diff --git a/misc/sys/cdefs.h b/misc/sys/cdefs.h index f9dcce4c8d..602779ebb7 100644 --- a/misc/sys/cdefs.h +++ b/misc/sys/cdefs.h @@ -17,8 +17,8 @@ Boston, MA 02111-1307, USA. */ #ifndef _SYS_CDEFS_H - #define _SYS_CDEFS_H 1 + #include <features.h> /* Some user header file might have defined this before. */ diff --git a/misc/sys/dir.h b/misc/sys/dir.h index a6384e6cc6..96b36c78df 100644 --- a/misc/sys/dir.h +++ b/misc/sys/dir.h @@ -17,8 +17,8 @@ Boston, MA 02111-1307, USA. */ #ifndef _SYS_DIR_H - #define _SYS_DIR_H 1 + #include <features.h> #include <dirent.h> diff --git a/misc/sys/file.h b/misc/sys/file.h index 4120882476..9f946fb327 100644 --- a/misc/sys/file.h +++ b/misc/sys/file.h @@ -17,8 +17,8 @@ Boston, MA 02111-1307, USA. */ #ifndef _SYS_FILE_H - #define _SYS_FILE_H 1 + #include <features.h> #ifndef _FCNTL_H diff --git a/misc/sys/ioctl.h b/misc/sys/ioctl.h index 4e940bd29f..644ac5b02f 100644 --- a/misc/sys/ioctl.h +++ b/misc/sys/ioctl.h @@ -17,23 +17,23 @@ Boston, MA 02111-1307, USA. */ #ifndef _SYS_IOCTL_H - #define _SYS_IOCTL_H 1 + #include <features.h> __BEGIN_DECLS /* Get the list of `ioctl' requests and related constants. */ -#include <ioctls.h> +#include <bits/ioctls.h> /* Define some types used by `ioctl' requests. */ -#include <ioctl-types.h> +#include <bits/ioctl-types.h> -/* On a Unix system, the system <sys/ioctl.h> probably defines some of the - symbols we define in <sys/ttydefaults.h> (usually with the same values). - The code to generate <ioctls.h> has omitted these symbols to avoid the - conflict, but a Unix program expects <sys/ioctl.h> to define them, so we - must include <sys/ttydefaults.h> here. */ +/* On a Unix system, the system <sys/ioctl.h> probably defines some of + the symbols we define in <sys/ttydefaults.h> (usually with the same + values). The code to generate <bits/ioctls.h> has omitted these + symbols to avoid the conflict, but a Unix program expects <sys/ioctl.h> + to define them, so we must include <sys/ttydefaults.h> here. */ #include <sys/ttydefaults.h> /* Perform the I/O control operation specified by REQUEST on FD. diff --git a/misc/sys/queue.h b/misc/sys/queue.h index 65612ce6f3..e675521273 100644 --- a/misc/sys/queue.h +++ b/misc/sys/queue.h @@ -33,8 +33,8 @@ * @(#)queue.h 8.3 (Berkeley) 12/13/93 */ -#ifndef _QUEUE_H_ -#define _QUEUE_H_ +#ifndef _SYS_QUEUE_H +#define _SYS_QUEUE_H 1 /* * This file defines three types of data structures: lists, tail queues, @@ -242,4 +242,4 @@ struct { \ (elm)->field.cqe_prev->field.cqe_next = \ (elm)->field.cqe_next; \ } -#endif /* !_QUEUE_H_ */ +#endif /* sys/queue.h */ diff --git a/misc/sys/select.h b/misc/sys/select.h index 2e102dd9fe..a151570bc6 100644 --- a/misc/sys/select.h +++ b/misc/sys/select.h @@ -20,15 +20,15 @@ /* POSIX 1003.1g: 6.2 Select from File Descriptor Sets <sys/select.h> */ #ifndef _SYS_SELECT_H - #define _SYS_SELECT_H 1 + #include <features.h> /* Get definition of needed basic types. */ -#include <gnu/types.h> +#include <bits/types.h> /* Get __FD_* definitions. */ -#include <selectbits.h> +#include <bits/select.h> /* Get definition of timer specification structures. */ #define __need_timespec diff --git a/misc/sys/syslog.h b/misc/sys/syslog.h index 6da3a3b4c3..48f01e2d74 100644 --- a/misc/sys/syslog.h +++ b/misc/sys/syslog.h @@ -33,6 +33,9 @@ * @(#)syslog.h 8.1 (Berkeley) 6/2/93 */ +#ifndef _SYS_SYSLOG_H +#define _SYS_SYSLOG_H 1 + #define _PATH_LOG "/dev/log" /* @@ -208,3 +211,5 @@ extern void vsyslog __P ((int __pri, __const char *__fmt, _BSD_VA_LIST_ __ap)); __END_DECLS #endif /* !KERNEL */ + +#endif /* sys/syslog.h */ diff --git a/misc/sys/uio.h b/misc/sys/uio.h index 901f9bbc25..3b11276362 100644 --- a/misc/sys/uio.h +++ b/misc/sys/uio.h @@ -17,8 +17,8 @@ Boston, MA 02111-1307, USA. */ #ifndef _SYS_UIO_H - #define _SYS_UIO_H 1 + #include <features.h> #include <sys/types.h> @@ -26,7 +26,7 @@ __BEGIN_DECLS /* This file defines `struct iovec'. */ -#include <iovec.h> +#include <bits/uio.h> /* Read data from file descriptor FD, and put the result in the diff --git a/misc/sys/ustat.h b/misc/sys/ustat.h index 24e0746688..239d70b25d 100644 --- a/misc/sys/ustat.h +++ b/misc/sys/ustat.h @@ -17,15 +17,17 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* This interface is obsolete. Use <sys/statfs.h> instead. */ +/* + * This interface is obsolete. Use <sys/statfs.h> instead. + */ #ifndef _SYS_USTAT_H - #define _SYS_USTAT_H 1 + #include <features.h> #include <sys/types.h> -#include <ustatbits.h> +#include <bits/ustat.h> __BEGIN_DECLS @@ -34,4 +36,4 @@ extern int ustat __P ((__dev_t __dev, struct ustat *__ubuf)); __END_DECLS -#endif /* _SYS_USTAT_H */ +#endif /* sys/ustat.h */ diff --git a/misc/sysexits.h b/misc/sysexits.h index 464cb11bab..e77efedd56 100644 --- a/misc/sysexits.h +++ b/misc/sysexits.h @@ -33,8 +33,8 @@ * @(#)sysexits.h 8.1 (Berkeley) 6/2/93 */ -#ifndef _SYSEXITS_H_ -#define _SYSEXITS_H_ +#ifndef _SYSEXITS_H +#define _SYSEXITS_H 1 /* * SYSEXITS.H -- Exit status codes for system programs. @@ -115,4 +115,4 @@ #define EX__MAX 78 /* maximum listed value */ -#endif /* !_SYSEXITS_H_ */ +#endif /* sysexits.h */ diff --git a/misc/syslog.c b/misc/syslog.c index 5521ceb9d0..acb1b69e00 100644 --- a/misc/syslog.c +++ b/misc/syslog.c @@ -49,7 +49,7 @@ static char sccsid[] = "@(#)syslog.c 8.4 (Berkeley) 3/18/94"; #include <time.h> #include <unistd.h> #include <stdlib.h> -#include <libc-lock.h> +#include <bits/libc-lock.h> #include <signal.h> #if __STDC__ diff --git a/misc/ttyent.h b/misc/ttyent.h index a3b4550776..58a1d7a179 100644 --- a/misc/ttyent.h +++ b/misc/ttyent.h @@ -33,9 +33,9 @@ * @(#)ttyent.h 8.1 (Berkeley) 6/2/93 */ -#ifndef _TTYENT_H_ +#ifndef _TTYENT_H +#define _TTYENT_H 1 -#define _TTYENT_H_ 1 #include <features.h> #define _PATH_TTYS "/etc/ttys" @@ -66,4 +66,4 @@ extern int endttyent __P ((void)); __END_DECLS -#endif /* !_TTYENT_H_ */ +#endif /* ttyent.h */ |