don't include function prototypes in the kernel

SCCS-vsn: sys/sys/signal.h 7.13
SCCS-vsn: sys/sys/wait.h 7.13
SCCS-vsn: sys/sys/stat.h 7.7
SCCS-vsn: sys/sys/times.h 7.3
SCCS-vsn: sys/sys/fcntl.h 5.7

diff --git a/usr/src/sys/sys/fcntl.h b/usr/src/sys/sys/fcntl.h
index 3f3ac73..2663bcd 100644 (file)
--- a/usr/src/sys/sys/fcntl.h
+++ b/usr/src/sys/sys/fcntl.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

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

  */
 
 #ifndef F_DUPFD
  */
 
 #ifndef F_DUPFD


@@ -77,12 +77,9 @@
 /* mask for file access modes */
 #define        O_ACCMODE       (O_RDONLY|O_WRONLY|O_RDWR)
 
 /* mask for file access modes */
 #define        O_ACCMODE       (O_RDONLY|O_WRONLY|O_RDWR)
 

+#ifndef KERNEL

 #if __STDC__ || c_plusplus
 #if __STDC__ || c_plusplus

-#ifdef KERNEL
-#include "types.h"
-#else

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

-#endif

 extern int fcntl(int, int, int);
 extern int creat(const char *, mode_t);
 extern int open(const char *, int, ...);
 extern int fcntl(int, int, int);
 extern int creat(const char *, mode_t);
 extern int open(const char *, int, ...);


@@ -91,5 +88,6 @@ extern int fcntl();
 extern int creat();
 extern int open();
 #endif
 extern int creat();
 extern int open();
 #endif

+#endif

 
 #endif /* !F_DUPFD */
 
 #endif /* !F_DUPFD */

diff --git a/usr/src/sys/sys/signal.h b/usr/src/sys/sys/signal.h
index 0f6a5e9..dcdd88f 100644 (file)
--- a/usr/src/sys/sys/signal.h
+++ b/usr/src/sys/sys/signal.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

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

  */
 
 #ifndef        NSIG
  */
 
 #ifndef        NSIG


@@ -192,12 +192,9 @@ struct     sigcontext {
 
 #endif /* KERNEL */
 
 
 #endif /* KERNEL */
 

+#ifndef KERNEL

 #if __STDC__ || c_plusplus
 #if __STDC__ || c_plusplus

-#ifdef KERNEL
-#include "types.h"
-#else

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

-#endif

 int kill(pid_t, int);
 int sigaction(int, const struct sigaction *, struct sigaction *);
 int sigprocmask(int, const sigset_t *, sigset_t *);
 int kill(pid_t, int);
 int sigaction(int, const struct sigaction *, struct sigaction *);
 int sigprocmask(int, const sigset_t *, sigset_t *);


@@ -210,4 +207,5 @@ int sigprocmask();
 int sigpending();
 int sigsuspend();
 #endif
 int sigpending();
 int sigsuspend();
 #endif

+#endif

 #endif /* NSIG */
 #endif /* NSIG */

diff --git a/usr/src/sys/sys/stat.h b/usr/src/sys/sys/stat.h
index d3fea28..dd0953e 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.6 (Berkeley) %G%
+ *     @(#)stat.h      7.7 (Berkeley) %G%

  */
 
 struct stat
  */
 
 struct stat


@@ -81,6 +81,7 @@ struct stat
 #define        S_ISSOCK(m)     ((m & 0170000) == 0140000)      /* socket */
 #endif
 
 #define        S_ISSOCK(m)     ((m & 0170000) == 0140000)      /* socket */
 #endif
 

+#ifndef KERNEL

 #if __STDC__ || c_plusplus
 mode_t umask(mode_t);
 int mkdir(const char *, mode_t);
 #if __STDC__ || c_plusplus
 mode_t umask(mode_t);
 int mkdir(const char *, mode_t);


@@ -96,3 +97,4 @@ int stat();
 int fstat();
 int chmod();
 #endif
 int fstat();
 int chmod();
 #endif

+#endif

diff --git a/usr/src/sys/sys/times.h b/usr/src/sys/sys/times.h
index cae0e91..4de2c6c 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.2 (Berkeley) %G%
+ *     @(#)times.h     7.3 (Berkeley) %G%

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


@@ -21,8 +21,10 @@ struct tms {
        clock_t tms_cstime;     /* System CPU time of terminated child procs */
 };
 
        clock_t tms_cstime;     /* System CPU time of terminated child procs */
 };
 

+#ifndef KERNEL

 #if __STDC__ || c_plusplus
 clock_t times(struct tms *);
 #else
 clock_t times();
 #endif
 #if __STDC__ || c_plusplus
 clock_t times(struct tms *);
 #else
 clock_t times();
 #endif

+#endif

diff --git a/usr/src/sys/sys/wait.h b/usr/src/sys/sys/wait.h
index c10f9cb..ee2f896 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.12 (Berkeley) %G%
+ *     @(#)wait.h      7.13 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


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

-#include <sys/types.h>

 #if __STDC__ || c_plusplus
 #if __STDC__ || c_plusplus

+#include <sys/types.h>

 pid_t wait(int *);
 pid_t waitpid(pid_t, int *, int);
 pid_t wait3(int *, int, struct rusage *);
 pid_t wait(int *);
 pid_t waitpid(pid_t, int *, int);
 pid_t wait3(int *, int, struct rusage *);