first pass at function prototypes with cdefs.h

protect include files included by other include files with #ifndef _NAME_H_

SCCS-vsn: sys/sys/signal.h 7.15
SCCS-vsn: sys/sys/ttychars.h 7.5
SCCS-vsn: sys/sys/tablet.h 7.4
SCCS-vsn: sys/sys/vcmd.h 7.3
SCCS-vsn: sys/sys/namei.h 7.12
SCCS-vsn: sys/sys/types.h 7.13
SCCS-vsn: sys/sys/wait.h 7.14
SCCS-vsn: sys/sys/dir.h 7.3
SCCS-vsn: sys/sys/dmap.h 7.2
SCCS-vsn: sys/sys/stat.h 7.9
SCCS-vsn: sys/sys/uio.h 7.6
SCCS-vsn: sys/sys/times.h 7.5
SCCS-vsn: sys/sys/ucred.h 7.5
SCCS-vsn: sys/sys/ipc.h 7.2
SCCS-vsn: sys/sys/cdefs.h 7.4
SCCS-vsn: sys/sys/ptrace.h 7.2
SCCS-vsn: sys/sys/time.h 7.5
SCCS-vsn: sys/sys/resource.h 7.4
SCCS-vsn: sys/sys/exec.h 7.4
SCCS-vsn: sys/sys/unistd.h 5.9
SCCS-vsn: sys/sys/ioctl.h 7.13
SCCS-vsn: sys/sys/shm.h 7.2
SCCS-vsn: sys/sys/malloc.h 7.22
SCCS-vsn: sys/sys/ttydev.h 7.7
SCCS-vsn: sys/sys/sysctl.h 7.5
SCCS-vsn: sys/sys/fcntl.h 5.10
SCCS-vsn: sys/sys/termios.h 7.20
SCCS-vsn: sys/sys/ttydefaults.h 7.8
SCCS-vsn: sys/sys/ioctl_compat.h 7.4
SCCS-vsn: sys/sys/queue.h 7.2
SCCS-vsn: sys/sys/disklabel.h 7.15
SCCS-vsn: sys/sys/filedesc.h 7.2
SCCS-vsn: include/fstab.h 5.11
SCCS-vsn: include/grp.h 5.3
SCCS-vsn: include/pwd.h 5.6
SCCS-vsn: include/setjmp.h 5.3
SCCS-vsn: include/sgtty.h 5.1
SCCS-vsn: include/ttyent.h 5.6
SCCS-vsn: include/string.h 5.7
SCCS-vsn: include/math.h 5.1
SCCS-vsn: include/regexp.h 5.1
SCCS-vsn: include/nlist.h 5.5
SCCS-vsn: include/time.h 5.9
SCCS-vsn: include/utime.h 5.2
SCCS-vsn: include/dirent.h 5.16

diff --git a/usr/src/include/dirent.h b/usr/src/include/dirent.h
index c8dd28f..0214718 100644 (file)
--- a/usr/src/include/dirent.h
+++ b/usr/src/include/dirent.h
@@ -4,11 +4,11 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)dirent.h    5.15 (Berkeley) %G%
+ *     @(#)dirent.h    5.16 (Berkeley) %G%

  */
 
  */
 

-#ifndef _DIRENT_
-#define _DIRENT_
+#ifndef _DIRENT_H_
+#define _DIRENT_H_

 
 /*
  * A directory entry has a struct dirent at the front of it, containing its
 
 /*
  * A directory entry has a struct dirent at the front of it, containing its


@@ -57,28 +57,20 @@ typedef struct _dirdesc {
 
 #endif /* _POSIX_SOURCE */
 
 
 #endif /* _POSIX_SOURCE */
 

-#if __STDC__ || c_plusplus
-extern DIR *opendir(const char *);
-extern struct dirent *readdir(DIR *);
-extern void rewinddir(DIR *);
-extern int closedir(DIR *);
-#ifndef _POSIX_SOURCE
-extern long telldir(const DIR *);
-extern void seekdir(DIR *, long);
-extern int scandir(const char *, struct dirent ***,
-    int (*)(struct dirent *), int (*)(void *, void *));
-extern int alphasort(const void *, const void *);
-#endif
-#else
-extern DIR *opendir();
-extern struct dirent *readdir();
-extern void rewinddir();
-extern int closedir();
+#include <sys/cdefs.h>
+
+__BEGIN_DECLS
+DIR *opendir __P((const char *));
+struct dirent *readdir __P((DIR *));
+void rewinddir __P((DIR *));
+int closedir __P((DIR *));

 #ifndef _POSIX_SOURCE
 #ifndef _POSIX_SOURCE

-extern long telldir();
-extern void seekdir();
-extern int scandir();
-extern int alphasort();
-#endif
+long telldir __P((const DIR *));
+void seekdir __P((DIR *, long));
+int scandir __P((const char *, struct dirent ***,
+    int (*)(struct dirent *), int (*)(void *, void *)));
+int alphasort __P((const void *, const void *));

 #endif
 #endif

-#endif /* _DIRENT_ */
+__END_DECLS
+
+#endif /* !_DIRENT_H_ */

diff --git a/usr/src/include/fstab.h b/usr/src/include/fstab.h
index d69641b..2ac50f9 100644 (file)
--- a/usr/src/include/fstab.h
+++ b/usr/src/include/fstab.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)fstab.h     5.10 (Berkeley) %G%
+ *     @(#)fstab.h     5.11 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -37,16 +37,12 @@ struct fstab {
        int     fs_passno;              /* pass number on parallel dump */
 };
 
        int     fs_passno;              /* pass number on parallel dump */
 };
 

-#if __STDC__ || c_plusplus
-extern struct fstab *getfsent(void);
-extern struct fstab *getfsspec(const char *);
-extern struct fstab *getfsfile(const char *);
-extern int setfsent(void);
-extern void endfsent(void);
-#else
-extern struct fstab *getfsent();
-extern struct fstab *getfsspec();
-extern struct fstab *getfsfile();
-extern int setfsent();
-extern void endfsent();
-#endif
+#include <sys/cdefs.h>
+
+__BEGIN_DECLS
+struct fstab *getfsent __P((void));
+struct fstab *getfsspec __P((const char *));
+struct fstab *getfsfile __P((const char *));
+int setfsent __P((void));
+void endfsent __P((void));
+__END_DECLS

diff --git a/usr/src/include/grp.h b/usr/src/include/grp.h
index f2b29b2..0ed922b 100644 (file)
--- a/usr/src/include/grp.h
+++ b/usr/src/include/grp.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)grp.h       5.2 (Berkeley) %G%
+ *     @(#)grp.h       5.3 (Berkeley) %G%

  */
 
 #ifndef _POSIX_SOURCE
  */
 
 #ifndef _POSIX_SOURCE


@@ -18,24 +18,16 @@ struct group {
        char    **gr_mem;               /* group members */
 };
 
        char    **gr_mem;               /* group members */
 };
 

-#if __STDC__ || c_plusplus
-extern struct group *getgrgid(gid_t);
-extern struct group *getgrnam(const char *);
-#ifndef _POSIX_SOURCE
-extern struct group *getgrent(void);
-extern int setgrent(void);
-extern void endgrent(void);
-extern void setgrfile(const char *);
-extern int setgroupent(int);
-#endif
-#else
-extern struct group *getgrgid();
-extern struct group *getgrnam();
+#include <sys/cdefs.h>
+
+__BEGIN_DECLS
+struct group *getgrgid __P((gid_t));
+struct group *getgrnam __P((const char *));

 #ifndef _POSIX_SOURCE
 #ifndef _POSIX_SOURCE

-extern struct group *getgrent();
-extern int setgrent();
-extern void endgrent();
-extern void setgrfile();
-extern int setgroupent();
-#endif
+struct group *getgrent __P((void));
+int setgrent __P((void));
+void endgrent __P((void));
+void setgrfile __P((const char *));
+int setgroupent __P((int));

 #endif
 #endif

+__END_DECLS

diff --git a/usr/src/include/math.h b/usr/src/include/math.h
index f39e83c..8551829 100644 (file)
--- a/usr/src/include/math.h
+++ b/usr/src/include/math.h
@@ -9,26 +9,20 @@
  * experiences (good or bad) with these elementary function codes, using
  * the sendbug(8) program, to the authors.
  *
  * experiences (good or bad) with these elementary function codes, using
  * the sendbug(8) program, to the authors.
  *

- *     @(#)math.h      4.8 (Berkeley) %G%
+ *     @(#)math.h      5.1 (Berkeley) %G%

  */
 
  */
 

-extern double asinh(), acosh(), atanh();
-extern double erf(), erfc();
-extern double exp(), expm1(), log(), log10(), log1p(), pow();
-extern double fabs(), floor(), ceil(), rint();
-extern double lgamma();
-extern double hypot(), cabs();
-extern double copysign(), drem(), logb(), scalb();
+#define        HUGE    1.701411733192644270e38

 
 

-#if defined(vax) || defined(tahoe)
-extern double infnan();
-#endif
+double acos(), acosh(), asin(), asinh(), atan(), atan2(), atanh(),
+       atof(), cabs(), cbrt(), ceil(), copysign(), cos(), cosh(),
+       drem(), erf(), erfc(), exp(), expm1(), fabs(), floor(), frexp(),
+       hypot(), j0(), j1(), jn(), ldexp(), lgamma(), log(), log10(),
+       log1p(), logb(), modf(), pow(), rint(), scalb(), sin(), sinh(),
+       sqrt(), tan(), tanh(), y0(), y1(), yn();

 
 

-extern int finite();
-extern double j0(), j1(), jn(), y0(), y1(), yn();
-extern double sin(), cos(), tan(), asin(), acos(), atan(), atan2();
-extern double sinh(), cosh(), tanh();
-extern double cbrt(), sqrt();
-extern double modf(), ldexp(), frexp(), atof();
+int finite();

 
 

-#define        HUGE    1.701411733192644270e38
+#if defined(vax) || defined(tahoe)
+double infnan();
+#endif

diff --git a/usr/src/include/nlist.h b/usr/src/include/nlist.h
index 333b163..9d0dce7 100644 (file)
--- a/usr/src/include/nlist.h
+++ b/usr/src/include/nlist.h
@@ -3,7 +3,7 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

- *     @(#)nlist.h     5.4 (Berkeley) %G%
+ *     @(#)nlist.h     5.5 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -45,8 +45,8 @@ struct        nlist {
  */
 #define        N_FORMAT        "%08x"
 
  */
 #define        N_FORMAT        "%08x"
 

-#if __STDC__ || c_plusplus
-extern int nlist(const char *, struct nlist *);
-#else
-extern int nlist();
-#endif
+#include <sys/cdefs.h>
+
+__BEGIN_DECLS
+int nlist __P((const char *, struct nlist *));
+__END_DECLS

diff --git a/usr/src/include/pwd.h b/usr/src/include/pwd.h
index da9ee29..cc8a83f 100644 (file)
--- a/usr/src/include/pwd.h
+++ b/usr/src/include/pwd.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)pwd.h       5.5 (Berkeley) %G%
+ *     @(#)pwd.h       5.6 (Berkeley) %G%

  */
 
 #include <sys/types.h>
  */
 
 #include <sys/types.h>


@@ -34,24 +34,16 @@ struct passwd {
        time_t  pw_expire;              /* account expiration */
 };
 
        time_t  pw_expire;              /* account expiration */
 };
 

-#if __STDC__ || c_plusplus
-struct passwd *getpwuid(uid_t);
-struct passwd *getpwnam(const char *);
-#ifndef _POSIX_SOURCE
-struct passwd *getpwent(void);
-int setpwent(void);
-void endpwent(void);
-void setpwfile(const char *);
-int setpassent(int);
-#endif
-#else
-struct passwd *getpwuid();
-struct passwd *getpwnam();
+#include <sys/cdefs.h>
+
+__BEGIN_DECLS
+struct passwd *getpwuid __P((uid_t));
+struct passwd *getpwnam __P((const char *));

 #ifndef _POSIX_SOURCE
 #ifndef _POSIX_SOURCE

-struct passwd *getpwent();
-int setpwent();
-void endpwent();
-void setpwfile();
-int setpassent();
-#endif
+struct passwd *getpwent __P((void));
+int setpwent __P((void));
+void endpwent __P((void));
+void setpwfile __P((const char *));
+int setpassent __P((int));

 #endif
 #endif

+__END_DECLS

diff --git a/usr/src/include/regexp.h b/usr/src/include/regexp.h
index 9abfe5c..85d143a 100644 (file)
--- a/usr/src/include/regexp.h
+++ b/usr/src/include/regexp.h
@@ -8,7 +8,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)regexp.h    1.5 (Berkeley) %G%
+ *     @(#)regexp.h    5.1 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -28,14 +28,11 @@ typedef struct regexp {
        char program[1];        /* Unwarranted chumminess with compiler. */
 } regexp;
 
        char program[1];        /* Unwarranted chumminess with compiler. */
 } regexp;
 

-#if __STDC__ || c_plusplus
-extern regexp *regcomp(const char *);
-extern int regexec(const  regexp *, const char *);
-extern void regsub(const  regexp *, const char *, char *);
-extern void regerror(const char *);
-#else
-extern regexp *regcomp();
-extern int regexec();
-extern void regsub();
-extern void regerror();
-#endif
+#include <sys/cdefs.h>
+
+__BEGIN_DECLS
+regexp *regcomp __P((const char *));
+int regexec __P((const  regexp *, const char *));
+void regsub __P((const  regexp *, const char *, char *));
+void regerror __P((const char *));
+__END_DECLS

diff --git a/usr/src/include/setjmp.h b/usr/src/include/setjmp.h
index 22d9d60..7341c3c 100644 (file)
--- a/usr/src/include/setjmp.h
+++ b/usr/src/include/setjmp.h
@@ -4,11 +4,11 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)setjmp.h    5.2 (Berkeley) %G%
+ *     @(#)setjmp.h    5.3 (Berkeley) %G%

  */
 
  */
 

-#ifndef _SETJMP_
-#define _SETJMP_
+#ifndef _SETJMP_H_
+#define _SETJMP_H_

 
 #ifdef hp300
 #define _JBLEN 17
 
 #ifdef hp300
 #define _JBLEN 17


@@ -36,23 +36,17 @@ typedef int sigjmp_buf[_JBLEN + 1];
 typedef int jmp_buf[_JBLEN];
 #endif
 
 typedef int jmp_buf[_JBLEN];
 #endif
 

-#if __STDC__ || c_plusplus
-int sigsetjmp(sigjmp_buf, int);
-void siglongjmp(sigjmp_buf, int);
-#ifndef _POSIX_SOURCE
-extern int setjmp(jmp_buf);
-extern int _setjmp(jmp_buf);
-extern void longjmp(jmp_buf, int);
-extern void _longjmp(jmp_buf, int);
-#endif
-#else
-int sigsetjmp();
-void siglongjmp();
+#include <sys/cdefs.h>
+
+__BEGIN_DECLS
+int sigsetjmp __P((sigjmp_buf, int));
+void siglongjmp __P((sigjmp_buf, int));

 #ifndef _POSIX_SOURCE
 #ifndef _POSIX_SOURCE

-extern int setjmp();
-extern int _setjmp();
-extern void longjmp();
-extern void _longjmp();
-#endif
-#endif
+int setjmp __P((jmp_buf));
+int _setjmp __P((jmp_buf));
+void longjmp __P((jmp_buf, int));
+void _longjmp __P((jmp_buf, int));

 #endif
 #endif

+__END_DECLS
+
+#endif /* !_SETJMP_H_ */

diff --git a/usr/src/include/sgtty.h b/usr/src/include/sgtty.h
index 841cd2b..c01dcf8 100644 (file)
--- a/usr/src/include/sgtty.h
+++ b/usr/src/include/sgtty.h
@@ -4,12 +4,12 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)sgtty.h     4.6 (Berkeley) %G%
+ *     @(#)sgtty.h     5.1 (Berkeley) %G%

  */
 
  */
 

-#ifndef        _IOCTL_
+#ifndef        _IOCTL_H_

 #ifndef USE_OLD_TTY
 #define        USE_OLD_TTY
 #endif
 #include <sys/ioctl.h>
 #ifndef USE_OLD_TTY
 #define        USE_OLD_TTY
 #endif
 #include <sys/ioctl.h>

-#endif
+#endif /* !_IOCTL_H_ */

diff --git a/usr/src/include/string.h b/usr/src/include/string.h
index 8342e17..d67ab83 100644 (file)
--- a/usr/src/include/string.h
+++ b/usr/src/include/string.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)string.h    5.6 (Berkeley) %G%
+ *     @(#)string.h    5.7 (Berkeley) %G%

  */
 
 #ifndef _STRING_H_
  */
 
 #ifndef _STRING_H_


@@ -20,92 +20,48 @@ typedef     _SIZE_T_        size_t;
 #define        NULL    0
 #endif
 
 #define        NULL    0
 #endif
 

-#if __STDC__ || c_plusplus
+#include <sys/cdefs.h>

 
 

-void   *memchr(const void *, int, size_t);
-int     memcmp(const void *, const void *, size_t);
-void   *memcpy(void *, const void *, size_t);
-void   *memmove(void *, const void *, size_t);
-void   *memset(void *, int, size_t);
-char   *strcat(char *, const char *);
-char   *strchr(const char *, int);
-int     strcmp(const char *, const char *);
-int     strcoll(const char *, const char *);
-char   *strcpy(char *, const char *);
-size_t  strcspn(const char *, const char *);
-char   *strerror(int);
-size_t  strlen(const char *);
-char   *strncat(char *, const char *, size_t);
-int     strncmp(const char *, const char *, size_t);
-char   *strncpy(char *, const char *, size_t);
-char   *strpbrk(const char *, const char *);
-char   *strrchr(const char *, int);
-size_t  strspn(const char *, const char *);
-char   *strstr(const char *, const char *);
-char   *strtok(char *, const char *);
-size_t  strxfrm(char *, const char *, size_t);
-
-#else
-
-void   *memchr();
-int     memcmp();
-void   *memcpy();
-void   *memmove();
-void   *memset();
-char   *strcat();
-char   *strchr();
-int     strcmp();
-int     strcoll();
-char   *strcpy();
-size_t  strcspn();
-char   *strerror();
-size_t  strlen();
-char   *strncat();
-int     strncmp();
-char   *strncpy();
-char   *strpbrk();
-char   *strrchr();
-size_t  strspn();
-char   *strstr();
-char   *strtok();
-size_t  strxfrm();
-
-#endif
+__BEGIN_DECLS
+void   *memchr __P((const void *, int, size_t));
+int     memcmp __P((const void *, const void *, size_t));
+void   *memcpy __P((void *, const void *, size_t));
+void   *memmove __P((void *, const void *, size_t));
+void   *memset __P((void *, int, size_t));
+char   *strcat __P((char *, const char *));
+char   *strchr __P((const char *, int));
+int     strcmp __P((const char *, const char *));
+int     strcoll __P((const char *, const char *));
+char   *strcpy __P((char *, const char *));
+size_t  strcspn __P((const char *, const char *));
+char   *strerror __P((int));
+size_t  strlen __P((const char *));
+char   *strncat __P((char *, const char *, size_t));
+int     strncmp __P((const char *, const char *, size_t));
+char   *strncpy __P((char *, const char *, size_t));
+char   *strpbrk __P((const char *, const char *));
+char   *strrchr __P((const char *, int));
+size_t  strspn __P((const char *, const char *));
+char   *strstr __P((const char *, const char *));
+char   *strtok __P((char *, const char *));
+size_t  strxfrm __P((char *, const char *, size_t));

 
 /* Nonstandard routines */
 #ifndef _ANSI_SOURCE
 
 /* Nonstandard routines */
 #ifndef _ANSI_SOURCE

-#if __STDC__ || c_plusplus
-
-int     bcmp(const char *, const char *, size_t);
-void    bcopy(const char *, char *, size_t);
-void    bzero(char *, size_t);
-int     ffs(int);
-char   *index(const char *, int);
-void   *memccpy(void *, const void *, int, size_t);
-char   *rindex(const char *, int);
-int     strcasecmp(const char *, const char *);
-char   *strdup(const char *);
-void    strmode(int, char *);
-int     strncasecmp(const char *, const char *, size_t);
-char   *strsep(char **, const char *);
-void    swab(const char *, char *, size_t);
-
-#else
-
-int     bcmp();
-void    bcopy();
-void    bzero();
-int     ffs();
-char   *index();
-void   *memccpy();
-char   *rindex();
-int     strcasecmp();
-char   *strdup();
-void   strmode();
-int     strncasecmp();
-char   *strsep();
-void    swab();
-
-#endif
+int     bcmp __P((const char *, const char *, size_t));
+void    bcopy __P((const char *, char *, size_t));
+void    bzero __P((char *, size_t));
+int     ffs __P((int));
+char   *index __P((const char *, int));
+void   *memccpy __P((void *, const void *, int, size_t));
+char   *rindex __P((const char *, int));
+int     strcasecmp __P((const char *, const char *));
+char   *strdup __P((const char *));
+void    strmode __P((int, char *));
+int     strncasecmp __P((const char *, const char *, size_t));
+char   *strsep __P((char **, const char *));
+void    swab __P((const char *, char *, size_t));

 #endif 
 #endif 

+__END_DECLS
+

 #endif /* _STRING_H_ */
 #endif /* _STRING_H_ */

diff --git a/usr/src/include/time.h b/usr/src/include/time.h
index 52906ee..90843c3 100644 (file)
--- a/usr/src/include/time.h
+++ b/usr/src/include/time.h
@@ -4,9 +4,12 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)time.h      5.8 (Berkeley) %G%
+ *     @(#)time.h      5.9 (Berkeley) %G%

  */
 
  */
 

+#ifndef _TIME_H_
+#define        _TIME_H_
+

 #include <machine/types.h>
 
 #ifndef        NULL
 #include <machine/types.h>
 
 #ifndef        NULL


@@ -42,28 +45,20 @@ struct tm {
        char    *tm_zone;       /* timezone abbreviation */
 };
 
        char    *tm_zone;       /* timezone abbreviation */
 };
 

-#if __STDC__ || c_plusplus
-extern struct tm *gmtime(const time_t *);
-extern struct tm *localtime(const time_t *);
-extern time_t mktime(const struct tm *);
-extern time_t time(time_t *);
-extern clock_t clock(void);
-extern double difftime(const time_t, const time_t);
-extern char *asctime(const struct tm *);
-extern char *ctime(const time_t *);
-extern char *timezone(int , int);
-extern void tzset(void);
-extern void tzsetwall(void);
-#else
-extern struct tm *gmtime();
-extern struct tm *localtime();
-extern clock_t clock();
-extern time_t mktime();
-extern time_t time();
-extern double difftime();
-extern char *asctime();
-extern char *ctime();
-extern char *timezone();
-extern void tzset();
-extern void tzsetwall();
-#endif 
+#include <sys/cdefs.h>
+
+__BEGIN_DECLS
+struct tm *gmtime __P((const time_t *));
+struct tm *localtime __P((const time_t *));
+time_t mktime __P((const struct tm *));
+time_t time __P((time_t *));
+clock_t clock __P((void));
+double difftime __P((const time_t, const time_t));
+char *asctime __P((const struct tm *));
+char *ctime __P((const time_t *));
+char *timezone __P((int , int));
+void tzset __P((void));
+void tzsetwall __P((void));
+__END_DECLS
+
+#endif /* !_TIME_H_ */

diff --git a/usr/src/include/ttyent.h b/usr/src/include/ttyent.h
index 4c4c77b..6f77c3e 100644 (file)
--- a/usr/src/include/ttyent.h
+++ b/usr/src/include/ttyent.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ttyent.h    5.5 (Berkeley) %G%
+ *     @(#)ttyent.h    5.6 (Berkeley) %G%

  */
 
 #define        _PATH_TTYS      "/etc/ttys"
  */
 
 #define        _PATH_TTYS      "/etc/ttys"


@@ -25,14 +25,11 @@ struct ttyent {
        char    *ty_comment;    /* comment field */
 };
 
        char    *ty_comment;    /* comment field */
 };
 

-#if __STDC__ || c_plusplus
-extern struct ttyent *getttyent(void);
-extern struct ttyent *getttynam(const char *);
-extern int setttyent(void);
-extern int endttyent(void);
-#else
-extern struct ttyent *getttyent();
-extern struct ttyent *getttynam();
-extern int setttyent();
-extern int endttyent();
-#endif
+#include <sys/cdefs.h>
+
+__BEGIN_DECLS
+struct ttyent *getttyent __P((void));
+struct ttyent *getttynam __P((const char *));
+int setttyent __P((void));
+int endttyent __P((void));
+__END_DECLS

diff --git a/usr/src/include/utime.h b/usr/src/include/utime.h
index 2bad628..9ff922e 100644 (file)
--- a/usr/src/include/utime.h
+++ b/usr/src/include/utime.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)utime.h     5.1 (Berkeley) %G%
+ *     @(#)utime.h     5.2 (Berkeley) %G%

  */
 
 struct utimbuf {
  */
 
 struct utimbuf {


@@ -12,8 +12,8 @@ struct utimbuf {
        time_t modtime;         /* Modification time */
 };
 
        time_t modtime;         /* Modification time */
 };
 

-#if __STDC__ || c_plusplus
-int utime(char *, struct utimbuf *);
-#else
-int utime();
-#endif
+#include <sys/cdefs.h>
+
+__BEGIN_DECLS
+int utime __P((char *, struct utimbuf *));
+__END_DECLS

diff --git a/usr/src/sys/sys/cdefs.h b/usr/src/sys/sys/cdefs.h
index 4bfba40..0f09f0e 100644 (file)
--- a/usr/src/sys/sys/cdefs.h
+++ b/usr/src/sys/sys/cdefs.h
@@ -4,24 +4,39 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)cdefs.h     7.3 (Berkeley) %G%
+ *     @(#)cdefs.h     7.4 (Berkeley) %G%

  */
 
  */
 

-/*
- * This file is designed to ease the porting from standard C to ANSI C.
- * It will eventually go away.
- * Questions to K. Bostic.
- */
+#ifndef        _CDEFS_H_
+#define        _CDEFS_H_
+
+#if defined(__cplusplus)
+#define        __BEGIN_DECLS   extern "C" {
+#define        __END_DECLS     };
+#else
+#define        __BEGIN_DECLS
+#define        __END_DECLS
+#endif

 
 

-#if __STDC__ || c_plusplus
-#define        CONCAT(x,y)     x ## y
-#define        PROTOTYPE(p)    p
-#define        STRING(x)       #x
+#if defined(__STDC__) || defined(__cplusplus)
+#define        __P(protos)     protos
+#define        __CONCAT(x,y)   x ## y
+#define        __STRING(x)     #x
+#else
+#ifdef __GNUC__
+#define        const           __const
+#define        inline          __inline
+#define        signed          __signed
+#define        volatile        __volatile

 #else
 #define        const
 #else
 #define        const

-#define        volatile
+#define        inline

 #define        signed
 #define        signed

-#define        CONCAT(x,y)     x/**/y
-#define        PROTOTYPE(p)    ()
-#define        STRING(x)       "x"
+#define        volatile

 #endif
 #endif

+#define        __P(protos)     ()
+#define        __CONCAT(x,y)   x/**/y
+#define        __STRING(x)     "x"
+#endif
+
+#endif /* !_CDEFS_H_ */

diff --git a/usr/src/sys/sys/dir.h b/usr/src/sys/sys/dir.h
index 0056e64..6651164 100644 (file)
--- a/usr/src/sys/sys/dir.h
+++ b/usr/src/sys/sys/dir.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)dir.h       7.2 (Berkeley) %G%
+ *     @(#)dir.h       7.3 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -12,7 +12,8 @@
  * and is provided solely (and temporarily) for backward compatibility.
  */
 
  * and is provided solely (and temporarily) for backward compatibility.
  */
 

-#ifndef _DIRENT_
+#ifndef _DIR_H_
+#define        _DIR_H_

 
 #include <dirent.h>
 
 
 #include <dirent.h>
 


@@ -31,4 +32,4 @@
 #define DIRSIZ(dp) \
     ((sizeof (struct direct) - (MAXNAMLEN+1)) + (((dp)->d_namlen+1 + 3) &~ 3))
 
 #define DIRSIZ(dp) \
     ((sizeof (struct direct) - (MAXNAMLEN+1)) + (((dp)->d_namlen+1 + 3) &~ 3))
 

-#endif /* _DIRENT_ */
+#endif /* !_DIR_H_ */

diff --git a/usr/src/sys/sys/disklabel.h b/usr/src/sys/sys/disklabel.h
index b0f8cfb..69b3c08 100644 (file)
--- a/usr/src/sys/sys/disklabel.h
+++ b/usr/src/sys/sys/disklabel.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)disklabel.h 7.14 (Berkeley) %G%
+ *     @(#)disklabel.h 7.15 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -265,9 +265,11 @@ struct partinfo {
 #endif LOCORE
 
 #if !defined(KERNEL) && !defined(LOCORE)
 #endif LOCORE
 
 #if !defined(KERNEL) && !defined(LOCORE)

-#if __STDC__ || c_plusplus
-extern struct disklabel *getdiskbyname(const char *);
-#else
-extern struct disklabel *getdiskbyname();
-#endif
+
+#include <sys/cdefs.h>
+
+__BEGIN_DECLS
+struct disklabel *getdiskbyname __P((const char *));
+__END_DECLS
+

 #endif
 #endif

diff --git a/usr/src/sys/sys/dmap.h b/usr/src/sys/sys/dmap.h
index 915d0aa..69bb2da 100644 (file)
--- a/usr/src/sys/sys/dmap.h
+++ b/usr/src/sys/sys/dmap.h
@@ -3,9 +3,12 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

- *     @(#)dmap.h      7.1 (Berkeley) %G%
+ *     @(#)dmap.h      7.2 (Berkeley) %G%

  */
 
  */
 

+#ifndef _DMAP_H_
+#define        _DMAP_H_
+

 /*
  * Definitions for the mapping of vitual swap
  * space to the physical swap area - the disk map.
 /*
  * Definitions for the mapping of vitual swap
  * space to the physical swap area - the disk map.


@@ -33,3 +36,5 @@ struct        dblock
        swblk_t db_base;        /* base of physical contig drum block */
        swblk_t db_size;        /* size of block */
 };
        swblk_t db_base;        /* base of physical contig drum block */
        swblk_t db_size;        /* size of block */
 };

+
+#endif /* !_DMAP_H_ */

diff --git a/usr/src/sys/sys/exec.h b/usr/src/sys/sys/exec.h
index 94f6edc..18ff724 100644 (file)
--- a/usr/src/sys/sys/exec.h
+++ b/usr/src/sys/sys/exec.h
@@ -3,9 +3,12 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

- *     @(#)exec.h      7.3 (Berkeley) %G%
+ *     @(#)exec.h      7.4 (Berkeley) %G%

  */
 
  */
 

+#ifndef _EXEC_H_
+#define        _EXEC_H_
+

 /*
  * Header prepended to each a.out file.
  */
 /*
  * Header prepended to each a.out file.
  */


@@ -39,3 +42,5 @@ unsigned long a_drsize;       /* size of data relocation */
 #define        MID_HP300       300     /* hp300 (68020+68881) BSD binary */
 #define        MID_HPUX        0x20C   /* hp200/300 HP-UX binary */
 #define        MID_HPUX800     0x20B   /* hp800 HP-UX binary */
 #define        MID_HP300       300     /* hp300 (68020+68881) BSD binary */
 #define        MID_HPUX        0x20C   /* hp200/300 HP-UX binary */
 #define        MID_HPUX800     0x20B   /* hp800 HP-UX binary */

+
+#endif /* !_EXEC_H_ */

diff --git a/usr/src/sys/sys/fcntl.h b/usr/src/sys/sys/fcntl.h
index 0558ba9..e2d4afa 100644 (file)
--- a/usr/src/sys/sys/fcntl.h
+++ b/usr/src/sys/sys/fcntl.h
@@ -4,12 +4,15 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)fcntl.h     5.9 (Berkeley) %G%
+ *     @(#)fcntl.h     5.10 (Berkeley) %G%

  */
 
  */
 

-#include "types.h"
+#ifndef _FCNTL_H_
+#define        _FCNTL_H_

 
 

-#ifndef F_DUPFD
+#ifndef KERNEL
+#include <sys/types.h>
+#endif

 
 /* command values for fcntl(2) */
 #define        F_DUPFD         0               /* duplicate file descriptor */
 
 /* command values for fcntl(2) */
 #define        F_DUPFD         0               /* duplicate file descriptor */


@@ -95,16 +98,13 @@ struct flock {
 };
 
 #ifndef KERNEL
 };
 
 #ifndef KERNEL

-#if __STDC__ || c_plusplus
-#include <sys/types.h>
-extern int fcntl(int, int, ...);
-extern int creat(const char *, mode_t);
-extern int open(const char *, int, ...);
-#else
-extern int fcntl();
-extern int creat();
-extern int open();
-#endif
+#include <sys/cdefs.h>
+
+__BEGIN_DECLS
+int    creat __P((const char *, mode_t));
+int    fcntl __P((int, int, ...));
+int    open __P((const char *, int, ...));
+__END_DECLS

 #endif
 
 #endif
 

-#endif /* !F_DUPFD */
+#endif /* !_FCNTL_H_ */

diff --git a/usr/src/sys/sys/filedesc.h b/usr/src/sys/sys/filedesc.h
index acbc31b..e215ed1 100644 (file)
--- a/usr/src/sys/sys/filedesc.h
+++ b/usr/src/sys/sys/filedesc.h
@@ -4,10 +4,12 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)filedesc.h  7.1 (Berkeley) %G%
+ *     @(#)filedesc.h  7.2 (Berkeley) %G%

  */
 
  */
 

-#ifndef _FILEDESC_
+#ifndef _FILEDESC_H_
+#define _FILEDESC_H_
+

 /*
  * This structure is used for the management of descriptors.
  * It may be shared by multiple threads.
 /*
  * This structure is used for the management of descriptors.
  * It may be shared by multiple threads.


@@ -71,4 +73,5 @@ char *ofileflagsfunc();
  */
 extern struct filedesc *fddup();
 extern int nofile;
  */
 extern struct filedesc *fddup();
 extern int nofile;

-#endif _FILEDESC_
+
+#endif /* !_FILEDESC_H_ */

diff --git a/usr/src/sys/sys/ioctl.h b/usr/src/sys/sys/ioctl.h
index 9494899..b1f0f0e 100644 (file)
--- a/usr/src/sys/sys/ioctl.h
+++ b/usr/src/sys/sys/ioctl.h
@@ -3,14 +3,14 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

- *     @(#)ioctl.h     7.12 (Berkeley) %G%
+ *     @(#)ioctl.h     7.13 (Berkeley) %G%

  */
 
 /*
  * Ioctl definitions
  */
  */
 
 /*
  * Ioctl definitions
  */

-#ifndef        _IOCTL_
-#define        _IOCTL_
+#ifndef        _IOCTL_H_
+#define        _IOCTL_H_

 
 /*
  * Window/terminal size structure.
 
 /*
  * Window/terminal size structure.


@@ -207,4 +207,4 @@ struct ttysize {
 #define        SIOCGARP        _IOWR('i',38, struct arpreq)    /* get arp entry */
 #define        SIOCDARP        _IOW('i', 32, struct arpreq)    /* delete arp entry */
 
 #define        SIOCGARP        _IOWR('i',38, struct arpreq)    /* get arp entry */
 #define        SIOCDARP        _IOW('i', 32, struct arpreq)    /* delete arp entry */
 

-#endif
+#endif /* !_IOCTL_H_ */

diff --git a/usr/src/sys/sys/ioctl_compat.h b/usr/src/sys/sys/ioctl_compat.h
index b39ee60..00489bd 100644 (file)
--- a/usr/src/sys/sys/ioctl_compat.h
+++ b/usr/src/sys/sys/ioctl_compat.h
@@ -4,9 +4,12 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ioctl_compat.h      7.3 (Berkeley) %G%
+ *     @(#)ioctl_compat.h      7.4 (Berkeley) %G%

  */
 
  */
 

+#ifndef _IOCTL_COMPAT_H_
+#define        _IOCTL_COMPAT_H_
+

 #ifdef KERNEL
 #include "ttychars.h"
 #include "ttydev.h"
 #ifdef KERNEL
 #include "ttychars.h"
 #include "ttydev.h"


@@ -134,3 +137,5 @@ struct sgttyb {
 #define        OTTYDISC        0
 #define        NETLDISC        1
 #define        NTTYDISC        2
 #define        OTTYDISC        0
 #define        NETLDISC        1
 #define        NTTYDISC        2

+
+#endif /* !_IOCTL_COMPAT_H_ */

diff --git a/usr/src/sys/sys/ipc.h b/usr/src/sys/sys/ipc.h
index bf04f61..2b26afd 100644 (file)
--- a/usr/src/sys/sys/ipc.h
+++ b/usr/src/sys/sys/ipc.h
@@ -9,14 +9,14 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ipc.h       7.1 (Berkeley) %G%
+ *     @(#)ipc.h       7.2 (Berkeley) %G%

  */
 
 /*
  * SVID compatible ipc.h file
  */
  */
 
 /*
  * SVID compatible ipc.h file
  */

-#ifndef _IPC_
-#define _IPC_
+#ifndef _IPC_H_
+#define _IPC_H_

 
 typedef        long    key_t;  /* XXX should be in types.h */
 
 
 typedef        long    key_t;  /* XXX should be in types.h */
 


@@ -45,4 +45,4 @@ struct ipc_perm {
 #define        IPC_SET         1       /* set options */
 #define        IPC_STAT        2       /* get options */
 
 #define        IPC_SET         1       /* set options */
 #define        IPC_STAT        2       /* get options */
 

-#endif /* _IPC_ */
+#endif /* !_IPC_H_ */

diff --git a/usr/src/sys/sys/malloc.h b/usr/src/sys/sys/malloc.h
index 9e21222..6a4c724 100644 (file)
--- a/usr/src/sys/sys/malloc.h
+++ b/usr/src/sys/sys/malloc.h
@@ -4,9 +4,12 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)malloc.h    7.21 (Berkeley) %G%
+ *     @(#)malloc.h    7.22 (Berkeley) %G%

  */
 
  */
 

+#ifndef _MALLOC_H_
+#define        _MALLOC_H_
+

 #define KMEMSTATS
 
 /*
 #define KMEMSTATS
 
 /*


@@ -228,3 +231,4 @@ extern struct kmembuckets bucket[];
 extern qaddr_t malloc();
 extern void free();
 #endif /* KERNEL */
 extern qaddr_t malloc();
 extern void free();
 #endif /* KERNEL */

+#endif /* !_MALLOC_H_ */

diff --git a/usr/src/sys/sys/namei.h b/usr/src/sys/sys/namei.h
index 3d5faa4..1a9ec94 100644 (file)
--- a/usr/src/sys/sys/namei.h
+++ b/usr/src/sys/sys/namei.h
@@ -4,11 +4,11 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)namei.h     7.11 (Berkeley) %G%
+ *     @(#)namei.h     7.12 (Berkeley) %G%

  */
 
  */
 

-#ifndef _NAMEI_
-#define        _NAMEI_
+#ifndef _NAMEI_H_
+#define        _NAMEI_H_

 
 #ifdef KERNEL
 #include "../ufs/dir.h"
 
 #ifdef KERNEL
 #include "../ufs/dir.h"


@@ -125,4 +125,4 @@ struct      nchstats {
        long    ncs_pass2;              /* names found with passes == 2 */
        long    ncs_2passes;            /* number of times we attempt it */
 };
        long    ncs_pass2;              /* names found with passes == 2 */
        long    ncs_2passes;            /* number of times we attempt it */
 };

-#endif /* _NAMEI_ */
+#endif /* !_NAMEI_H_ */

diff --git a/usr/src/sys/sys/ptrace.h b/usr/src/sys/sys/ptrace.h
index 4bdf4b4..656f462 100644 (file)
--- a/usr/src/sys/sys/ptrace.h
+++ b/usr/src/sys/sys/ptrace.h
@@ -3,11 +3,11 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

- *     @(#)ptrace.h    7.1 (Berkeley) %G%
+ *     @(#)ptrace.h    7.2 (Berkeley) %G%

  */
 
  */
 

-#ifndef _PTRACE_
-#define _PTRACE_
+#ifndef _PTRACE_H_
+#define _PTRACE_H_

 
 #define PT_TRACE_ME    0       /* child declares it's being traced */
 #define PT_READ_I      1       /* read word in child's I space */
 
 #define PT_TRACE_ME    0       /* child declares it's being traced */
 #define PT_READ_I      1       /* read word in child's I space */


@@ -20,4 +20,4 @@
 #define PT_KILL                8       /* kill the child process */
 #define PT_STEP                9       /* single step the child */
 
 #define PT_KILL                8       /* kill the child process */
 #define PT_STEP                9       /* single step the child */
 

-#endif
+#endif /* !_PTRACE_H_ */

diff --git a/usr/src/sys/sys/queue.h b/usr/src/sys/sys/queue.h
index 3aed13e..a0f6f22 100644 (file)
--- a/usr/src/sys/sys/queue.h
+++ b/usr/src/sys/sys/queue.h
@@ -10,15 +10,15 @@
  * The CMU software License Agreement specifies the terms and conditions
  * for use and redistribution.
  *
  * The CMU software License Agreement specifies the terms and conditions
  * for use and redistribution.
  *

- *     @(#)queue.h     7.1 (Berkeley) %G%
+ *     @(#)queue.h     7.2 (Berkeley) %G%

  */
 
 /*
  *     Type definitions for generic queues.
  */
 
  */
 
 /*
  *     Type definitions for generic queues.
  */
 

-#ifndef        _QUEUE_
-#define        _QUEUE_
+#ifndef        _QUEUE_H_
+#define        _QUEUE_H_

 
 struct queue_entry {
        struct queue_entry      *next;          /* next element */
 
 struct queue_entry {
        struct queue_entry      *next;          /* next element */


@@ -81,4 +81,4 @@ typedef       struct queue_entry      *queue_entry_t;
        queue_remove((h), (e), t, f);                           \
 }
 
        queue_remove((h), (e), t, f);                           \
 }
 

-#endif /* _QUEUE_ */
+#endif /* !_QUEUE_H_ */

diff --git a/usr/src/sys/sys/resource.h b/usr/src/sys/sys/resource.h
index d2c304b..058871d 100644 (file)
--- a/usr/src/sys/sys/resource.h
+++ b/usr/src/sys/sys/resource.h
@@ -4,9 +4,12 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)resource.h  7.3 (Berkeley) %G%
+ *     @(#)resource.h  7.4 (Berkeley) %G%

  */
 
  */
 

+#ifndef _RESOURCE_H_
+#define        _RESOURCE_H_
+

 /*
  * Process priority specifications to get/setpriority.
  */
 /*
  * Process priority specifications to get/setpriority.
  */


@@ -63,3 +66,5 @@ struct rlimit {
        long    rlim_cur;               /* current (soft) limit */
        long    rlim_max;               /* maximum value for rlim_cur */
 };
        long    rlim_cur;               /* current (soft) limit */
        long    rlim_max;               /* maximum value for rlim_cur */
 };

+
+#endif /* !_RESOURCE_H_ */

diff --git a/usr/src/sys/sys/shm.h b/usr/src/sys/sys/shm.h
index db51e22..6373866 100644 (file)
--- a/usr/src/sys/sys/shm.h
+++ b/usr/src/sys/sys/shm.h
@@ -9,14 +9,14 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)shm.h       7.1 (Berkeley) %G%
+ *     @(#)shm.h       7.2 (Berkeley) %G%

  */
 
 /*
  * SVID compatible shm.h file
  */
  */
 
 /*
  * SVID compatible shm.h file
  */

-#ifndef _SHM_
-#define _SHM_
+#ifndef _SHM_H_
+#define _SHM_H_

 
 #ifdef KERNEL
 #include "ipc.h"
 
 #ifdef KERNEL
 #include "ipc.h"


@@ -65,4 +65,4 @@ struct        shmid_ds        *shmsegs;
 struct shminfo         shminfo;
 #endif
 
 struct shminfo         shminfo;
 #endif
 

-#endif /* _SHM_ */
+#endif /* !_SHM_H_ */

diff --git a/usr/src/sys/sys/signal.h b/usr/src/sys/sys/signal.h
index 5b04a09..30663c1 100644 (file)
--- a/usr/src/sys/sys/signal.h
+++ b/usr/src/sys/sys/signal.h
@@ -4,10 +4,12 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)signal.h    7.14 (Berkeley) %G%
+ *     @(#)signal.h    7.15 (Berkeley) %G%

  */
 
  */
 

-#ifndef        NSIG
+#ifndef        _SIGNAL_H_
+#define        _SIGNAL_H_
+

 #define NSIG   32              /* counting 0; could be 33 (mask is 1-32) */
 
 #ifndef _POSIX_SOURCE
 #define NSIG   32              /* counting 0; could be 33 (mask is 1-32) */
 
 #ifndef _POSIX_SOURCE


@@ -69,19 +71,15 @@ void        (*signal())();
 
 typedef unsigned int sigset_t;
 
 
 typedef unsigned int sigset_t;
 

-#if __STDC__ || c_plusplus
-int sigemptyset(sigset_t *);
-int sigfillset(sigset_t *);
-int sigaddset(sigset_t *, int);
-int sigdelset(sigset_t *, int);
-int sigismember(const sigset_t *, int);
-#else
-int sigemptyset();
-int sigfillset();
-int sigaddset();
-int sigdelset();
-int sigismember();
-#endif
+#include <sys/cdefs.h>
+
+__BEGIN_DECLS
+int    sigaddset __P((sigset_t *, int));
+int    sigdelset __P((sigset_t *, int));
+int    sigemptyset __P((sigset_t *));
+int    sigfillset __P((sigset_t *));
+int    sigismember __P((const sigset_t *, int));
+__END_DECLS

 
 #define sigemptyset(set)       ( *(set) = 0 )
 #define sigfillset(set)                ( *(set) = ~(sigset_t)0, 0 )
 
 #define sigemptyset(set)       ( *(set) = 0 )
 #define sigfillset(set)                ( *(set) = ~(sigset_t)0, 0 )


@@ -189,19 +187,14 @@ struct    sigcontext {
 #endif /* KERNEL */
 
 #ifndef KERNEL
 #endif /* KERNEL */
 
 #ifndef KERNEL

-#if __STDC__ || c_plusplus

 #include <sys/types.h>
 #include <sys/types.h>

-int kill(pid_t, int);
-int sigaction(int, const struct sigaction *, struct sigaction *);
-int sigprocmask(int, const sigset_t *, sigset_t *);
-int sigpending(sigset_t *);
-int sigsuspend(const sigset_t *);
-#else
-int kill();
-int sigaction();
-int sigprocmask();
-int sigpending();
-int sigsuspend();
-#endif
+
+__BEGIN_DECLS
+int    kill __P((pid_t, int));
+int    sigaction __P((int, const struct sigaction *, struct sigaction *));
+int    sigpending __P((sigset_t *));
+int    sigprocmask __P((int, const sigset_t *, sigset_t *));
+int    sigsuspend __P((const sigset_t *));
+__END_DECLS

 #endif
 #endif

-#endif /* NSIG */
+#endif /* !_SIGNAL_H_ */

diff --git a/usr/src/sys/sys/stat.h b/usr/src/sys/sys/stat.h
index c992c8e..985d4c6 100644 (file)
--- a/usr/src/sys/sys/stat.h
+++ b/usr/src/sys/sys/stat.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)stat.h      7.8 (Berkeley) %G%
+ *     @(#)stat.h      7.9 (Berkeley) %G%

  */
 
 struct stat
  */
 
 struct stat


@@ -85,19 +85,14 @@ struct stat
 #endif
 
 #ifndef KERNEL
 #endif
 
 #ifndef KERNEL

-#if __STDC__ || c_plusplus
-mode_t umask(mode_t);
-int mkdir(const char *, mode_t);
-int mkfifo(const char *, mode_t);
-int stat(const char *, struct stat *);
-int fstat(int, struct stat *);
-int chmod(const char *, mode_t);
-#else
-mode_t umask();
-int mkdir();
-int mkfifo();
-int stat();
-int fstat();
-int chmod();
-#endif
+#include <sys/cdefs.h>
+
+__BEGIN_DECLS
+mode_t umask __P((mode_t));
+int    chmod __P((const char *, mode_t));
+int    fstat __P((int, struct stat *));
+int    mkdir __P((const char *, mode_t));
+int    mkfifo __P((const char *, mode_t));
+int    stat __P((const char *, struct stat *));
+__END_DECLS

 #endif
 #endif

diff --git a/usr/src/sys/sys/sysctl.h b/usr/src/sys/sys/sysctl.h
index fb3ee64..a4c3c8d 100644 (file)
--- a/usr/src/sys/sys/sysctl.h
+++ b/usr/src/sys/sys/sysctl.h
@@ -4,13 +4,15 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)sysctl.h    7.4 (Berkeley) %G%
+ *     @(#)sysctl.h    7.5 (Berkeley) %G%

  */
 
  */
 

+#ifndef _KINFO_H_
+#define        _KINFO_H_
+

 /*
  * Get kernel info
  */
 /*
  * Get kernel info
  */

-

 #define ki_op(x)               ((x)&0x0000ffff)
 #define ki_type(x)             ((x)&0x0000ff00)
 
 #define ki_op(x)               ((x)&0x0000ffff)
 #define ki_type(x)             ((x)&0x0000ff00)
 


@@ -52,3 +54,5 @@ struct kinfo_lock {
 #ifdef KERNEL
 extern struct kinfo_lock kinfo_lock;
 #endif
 #ifdef KERNEL
 extern struct kinfo_lock kinfo_lock;
 #endif

+
+#endif /* !_KINFO_H_ */

diff --git a/usr/src/sys/sys/tablet.h b/usr/src/sys/sys/tablet.h
index 1178f57..9590b4a 100644 (file)
--- a/usr/src/sys/sys/tablet.h
+++ b/usr/src/sys/sys/tablet.h
@@ -3,10 +3,12 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

- *     @(#)tablet.h    7.3 (Berkeley) %G%
+ *     @(#)tablet.h    7.4 (Berkeley) %G%

  */
 
  */
 

-#ifndef _TABLET_
+#ifndef _TABLET_H_
+#define        _TABLET_H_
+

 /*
  * Tablet line discipline.
  */
 /*
  * Tablet line discipline.
  */


@@ -67,3 +69,5 @@ struct        polpos {
 #define BIOSTYPE       _IOW('b', 3, int)       /* set tablet type */
 #define BIOGTYPE       _IOR('b', 4, int)       /* get tablet type*/
 #endif
 #define BIOSTYPE       _IOW('b', 3, int)       /* set tablet type */
 #define BIOGTYPE       _IOR('b', 4, int)       /* get tablet type*/
 #endif

+
+#endif /* !_TABLET_H_ */

diff --git a/usr/src/sys/sys/termios.h b/usr/src/sys/sys/termios.h
index c88c57c..bac9d11 100644 (file)
--- a/usr/src/sys/sys/termios.h
+++ b/usr/src/sys/sys/termios.h
@@ -4,14 +4,14 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)termios.h   7.19 (Berkeley) %G%
+ *     @(#)termios.h   7.20 (Berkeley) %G%

  */
 
 /*
  *  termios structure
  */
  */
 
 /*
  *  termios structure
  */

-#ifndef _TERMIOS_
-#define _TERMIOS_
+#ifndef _TERMIOS_H_
+#define _TERMIOS_H_

 
 /* 
  * Special Control Characters 
 
 /* 
  * Special Control Characters 


@@ -197,7 +197,7 @@ struct termios {
 /*
  * END OF PROTECTED INCLUDE.
  */
 /*
  * END OF PROTECTED INCLUDE.
  */

-#endif /* _TERMIOS_ */
+#endif /* !_TERMIOS_H_ */

 
 #ifndef _POSIX_SOURCE
 #ifdef KERNEL
 
 #ifndef _POSIX_SOURCE
 #ifdef KERNEL

diff --git a/usr/src/sys/sys/time.h b/usr/src/sys/sys/time.h
index 405a4d3..71a2813 100644 (file)
--- a/usr/src/sys/sys/time.h
+++ b/usr/src/sys/sys/time.h
@@ -4,11 +4,11 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)time.h      7.4 (Berkeley) %G%
+ *     @(#)time.h      7.5 (Berkeley) %G%

  */
 
  */
 

-#ifndef _TIME_
-#define _TIME_
+#ifndef _SYS_TIME_H_
+#define _SYS_TIME_H_

 
 /*
  * Structure returned by gettimeofday(2) system call,
 
 /*
  * Structure returned by gettimeofday(2) system call,


@@ -59,4 +59,4 @@ struct        itimerval {
 #include <time.h>
 #endif
 
 #include <time.h>
 #endif
 

-#endif /* _TIME_ */
+#endif /* !_SYS_TIME_H_ */

diff --git a/usr/src/sys/sys/times.h b/usr/src/sys/sys/times.h
index d57beac..aa4f58d 100644 (file)
--- a/usr/src/sys/sys/times.h
+++ b/usr/src/sys/sys/times.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)times.h     7.4 (Berkeley) %G%
+ *     @(#)times.h     7.5 (Berkeley) %G%

  */
 
 #include <machine/types.h>
  */
 
 #include <machine/types.h>


@@ -22,9 +22,9 @@ struct tms {
 };
 
 #ifndef KERNEL
 };
 
 #ifndef KERNEL

-#if __STDC__ || c_plusplus
-clock_t times(struct tms *);
-#else
-clock_t times();
-#endif
+#include <sys/cdefs.h>
+
+__BEGIN_DECLS
+clock_t        times __P((struct tms *));
+__END_DECLS

 #endif
 #endif

diff --git a/usr/src/sys/sys/ttychars.h b/usr/src/sys/sys/ttychars.h
index 57d58fb..50beb44 100644 (file)
--- a/usr/src/sys/sys/ttychars.h
+++ b/usr/src/sys/sys/ttychars.h
@@ -12,8 +12,8 @@
  * User visible structures and constants
  * related to terminal handling.
  */
  * User visible structures and constants
  * related to terminal handling.
  */

-#ifndef _TTYCHARS_
-#define        _TTYCHARS_
+#ifndef _TTYCHARS_H_
+#define        _TTYCHARS_H_

 
 struct ttychars {
        char    tc_erase;       /* erase last character */
 
 struct ttychars {
        char    tc_erase;       /* erase last character */


@@ -34,4 +34,4 @@ struct ttychars {
 #ifdef USE_OLD_TTY
 #include <sys/ttydefaults.h>   /* to pick up character defaults */
 #endif
 #ifdef USE_OLD_TTY
 #include <sys/ttydefaults.h>   /* to pick up character defaults */
 #endif

-#endif /* _TTYCHARS */
+#endif /* !_TTYCHARS_H_ */

diff --git a/usr/src/sys/sys/ttydefaults.h b/usr/src/sys/sys/ttydefaults.h
index 5c078ca..65ffbbd 100644 (file)
--- a/usr/src/sys/sys/ttydefaults.h
+++ b/usr/src/sys/sys/ttydefaults.h
@@ -3,14 +3,14 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

- *     @(#)ttydefaults.h       7.7 (Berkeley) %G%
+ *     @(#)ttydefaults.h       7.8 (Berkeley) %G%

  */
 
 /*
  * System wide defaults for terminal state.
  */
  */
 
 /*
  * System wide defaults for terminal state.
  */

-#ifndef _TTYDEFAULTS_
-#define        _TTYDEFAULTS_
+#ifndef _TTYDEFAULTS_H_
+#define        _TTYDEFAULTS_H_

 
 /*
  * Defaults on "first" open.
 
 /*
  * Defaults on "first" open.


@@ -49,7 +49,7 @@
 #define        CFLUSH          CDISCARD
 
 /* PROTECTED INCLUSION ENDS HERE */
 #define        CFLUSH          CDISCARD
 
 /* PROTECTED INCLUSION ENDS HERE */

-#endif /* _TTYDEFAULTS_ */
+#endif /* !_TTYDEFAULTS_H_ */

 
 /*
  * #define TTYDEFCHARS to include an array of default control characters.
 
 /*
  * #define TTYDEFCHARS to include an array of default control characters.

diff --git a/usr/src/sys/sys/ttydev.h b/usr/src/sys/sys/ttydev.h
index 53171bb..176f1f4 100644 (file)
--- a/usr/src/sys/sys/ttydev.h
+++ b/usr/src/sys/sys/ttydev.h
@@ -3,7 +3,7 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

- *     @(#)ttydev.h    7.6 (Berkeley) %G%
+ *     @(#)ttydev.h    7.7 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -13,8 +13,8 @@
 /*
  * Terminal definitions related to underlying hardware.
  */
 /*
  * Terminal definitions related to underlying hardware.
  */

-#ifndef _TTYDEV_
-#define        _TTYDEV_
+#ifndef _TTYDEV_H_
+#define        _TTYDEV_H_

 
 #ifdef USE_OLD_TTY
 /*
 
 #ifdef USE_OLD_TTY
 /*


@@ -38,4 +38,4 @@
 #define EXTB   15
 #endif /* USE_OLD_TTY */
 
 #define EXTB   15
 #endif /* USE_OLD_TTY */
 

-#endif /* _TTYDEV_ */
+#endif /* !_TTYDEV_H_ */

diff --git a/usr/src/sys/sys/types.h b/usr/src/sys/sys/types.h
index 1e4ccdb..4ae9f4f 100644 (file)
--- a/usr/src/sys/sys/types.h
+++ b/usr/src/sys/sys/types.h
@@ -3,11 +3,11 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

- *     @(#)types.h     7.12 (Berkeley) %G%
+ *     @(#)types.h     7.13 (Berkeley) %G%

  */
 
  */
 

-#ifndef _TYPES_
-#define        _TYPES_
+#ifndef _TYPES_H_
+#define        _TYPES_H_

 
 typedef        short   dev_t;
 #ifndef _POSIX_SOURCE
 
 typedef        short   dev_t;
 #ifndef _POSIX_SOURCE


@@ -91,4 +91,4 @@ typedef       struct fd_set {
 #define        FD_ZERO(p)      bzero((char *)(p), sizeof(*(p)))
 
 #endif /* !_POSIX_SOURCE */
 #define        FD_ZERO(p)      bzero((char *)(p), sizeof(*(p)))
 
 #endif /* !_POSIX_SOURCE */

-#endif /* _TYPES_ */
+#endif /* !_TYPES_H_ */

diff --git a/usr/src/sys/sys/ucred.h b/usr/src/sys/sys/ucred.h
index f835b66..0a4ae88 100644 (file)
--- a/usr/src/sys/sys/ucred.h
+++ b/usr/src/sys/sys/ucred.h
@@ -4,11 +4,11 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ucred.h     7.4 (Berkeley) %G%
+ *     @(#)ucred.h     7.5 (Berkeley) %G%

  */
 
  */
 

-#ifndef _UCRED_
-#define        _UCRED_
+#ifndef _UCRED_H_
+#define        _UCRED_H_

 
 /*
  * Credentials.
 
 /*
  * Credentials.


@@ -28,4 +28,5 @@ struct ucred *crget();
 struct ucred *crcopy();
 struct ucred *crdup();
 #endif KERNEL
 struct ucred *crcopy();
 struct ucred *crdup();
 #endif KERNEL

-#endif _UCRED_
+
+#endif /* !_UCRED_H_ */

diff --git a/usr/src/sys/sys/uio.h b/usr/src/sys/sys/uio.h
index ab77d5b..428bfc8 100644 (file)
--- a/usr/src/sys/sys/uio.h
+++ b/usr/src/sys/sys/uio.h
@@ -4,11 +4,11 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)uio.h       7.5 (Berkeley) %G%
+ *     @(#)uio.h       7.6 (Berkeley) %G%

  */
 
  */
 

-#ifndef _UIO_
-#define        _UIO_
+#ifndef _UIO_H_
+#define        _UIO_H_

 
 struct iovec {
        caddr_t iov_base;
 
 struct iovec {
        caddr_t iov_base;


@@ -41,4 +41,4 @@ struct uio {
 #define UIO_MAXIOV     1024            /* max 1K of iov's */
 #define UIO_SMALLIOV   8               /* 8 on stack, else malloc */
 
 #define UIO_MAXIOV     1024            /* max 1K of iov's */
 #define UIO_SMALLIOV   8               /* 8 on stack, else malloc */
 

-#endif /* !_UIO_ */
+#endif /* !_UIO_H_ */

diff --git a/usr/src/sys/sys/unistd.h b/usr/src/sys/sys/unistd.h
index 312ada5..5783036 100644 (file)
--- a/usr/src/sys/sys/unistd.h
+++ b/usr/src/sys/sys/unistd.h
@@ -4,9 +4,12 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)unistd.h    5.8 (Berkeley) %G%
+ *     @(#)unistd.h    5.9 (Berkeley) %G%

  */
 
  */
 

+#ifndef _UNISTD_H_
+#define        _UNISTD_H_
+

 /* compile-time symbolic constants */
 #define        _POSIX_JOB_CONTROL      /* implementation supports job control */
 /*#define      _POSIX_SAVED_IDS        /* saved set-user-ID and set-group-ID */
 /* compile-time symbolic constants */
 #define        _POSIX_JOB_CONTROL      /* implementation supports job control */
 /*#define      _POSIX_SAVED_IDS        /* saved set-user-ID and set-group-ID */


@@ -65,12 +68,12 @@
 #define        _SC_SAVED_IDS           7
 #define        _SC_VERSION             8
 
 #define        _SC_SAVED_IDS           7
 #define        _SC_VERSION             8
 

-#if __STDC__ || c_plusplus
-char   *cuserid(const char *);
-char   *ctermid();
-char   *getlogin(void);
-#else
-char   *cuserid();
-char   *ctermid();
-char   *getlogin();
-#endif
+#include <sys/cdefs.h>
+
+__BEGIN_DECLS
+char   *getlogin __P((void));
+char   *ctermid __P(());
+char   *cuserid __P((const char *));
+__END_DECLS
+
+#endif /* !_UNISTD_H_ */

diff --git a/usr/src/sys/sys/vcmd.h b/usr/src/sys/sys/vcmd.h
index 164d18b..757e48f 100644 (file)
--- a/usr/src/sys/sys/vcmd.h
+++ b/usr/src/sys/sys/vcmd.h
@@ -3,16 +3,14 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

- *     @(#)vcmd.h      7.2 (Berkeley) %G%
+ *     @(#)vcmd.h      7.3 (Berkeley) %G%

  */
 
  */
 

-#ifndef _IOCTL_

 #ifdef KERNEL
 #include "ioctl.h"
 #else
 #include <sys/ioctl.h>
 #endif
 #ifdef KERNEL
 #include "ioctl.h"
 #else
 #include <sys/ioctl.h>
 #endif

-#endif

 
 #define        VPRINT          0100
 #define        VPLOT           0200
 
 #define        VPRINT          0100
 #define        VPLOT           0200

diff --git a/usr/src/sys/sys/wait.h b/usr/src/sys/sys/wait.h
index ee2f896..83a79f5 100644 (file)
--- a/usr/src/sys/sys/wait.h
+++ b/usr/src/sys/sys/wait.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)wait.h      7.13 (Berkeley) %G%
+ *     @(#)wait.h      7.14 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -113,16 +113,13 @@ union wait {
 #endif /* _POSIX_SOURCE */
 
 #ifndef KERNEL
 #endif /* _POSIX_SOURCE */
 
 #ifndef KERNEL

-#if __STDC__ || c_plusplus

 #include <sys/types.h>
 #include <sys/types.h>

-pid_t wait(int *);
-pid_t waitpid(pid_t, int *, int);
-pid_t wait3(int *, int, struct rusage *);
-pid_t wait4(pid_t, int *, int, struct rusage *);
-#else
-pid_t wait();
-pid_t waitpid();
-pid_t wait3();
-pid_t wait4();
-#endif
+#include <sys/cdefs.h>
+
+__BEGIN_DECLS
+pid_t  wait __P((int *));
+pid_t  wait3 __P((int *, int, struct rusage *));
+pid_t  wait4 __P((pid_t, int *, int, struct rusage *));
+pid_t  waitpid __P((pid_t, int *, int));
+__END_DECLS

 #endif
 #endif