C++ needs prototypes, too

SCCS-vsn: sys/sys/disklabel.h 7.13
SCCS-vsn: sys/sys/fcntl.h 5.5
SCCS-vsn: sys/sys/signal.h 7.9
SCCS-vsn: sys/sys/stat.h 7.6
SCCS-vsn: sys/sys/cdefs.h 7.2

diff --git a/usr/src/sys/sys/cdefs.h b/usr/src/sys/sys/cdefs.h
index bee8175..4ecc239 100644 (file)
--- a/usr/src/sys/sys/cdefs.h
+++ b/usr/src/sys/sys/cdefs.h
@@ -14,7 +14,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *

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

  */
 
 /*
  */
 
 /*


@@ -23,7 +23,7 @@
  * Questions to K. Bostic.
  */
 
  * Questions to K. Bostic.
  */
 

-#ifdef __STDC__
+#if __STDC__ || c_plusplus

 #define        CONCAT(x,y)     x ## y
 #define        PROTOTYPE(p)    p
 #define        STRING(x)       #x
 #define        CONCAT(x,y)     x ## y
 #define        PROTOTYPE(p)    p
 #define        STRING(x)       #x

diff --git a/usr/src/sys/sys/disklabel.h b/usr/src/sys/sys/disklabel.h
index 40a50f9..1e43247 100644 (file)
--- a/usr/src/sys/sys/disklabel.h
+++ b/usr/src/sys/sys/disklabel.h
@@ -14,7 +14,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *

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

  */
 
 /*
  */
 
 /*


@@ -275,7 +275,7 @@ struct partinfo {
 #endif LOCORE
 
 #if !defined(KERNEL) && !defined(LOCORE)
 #endif LOCORE
 
 #if !defined(KERNEL) && !defined(LOCORE)

-#ifdef __STDC__
+#if __STDC__ || c_plusplus

 extern struct disklabel *getdiskbyname(const char *);
 #else
 extern struct disklabel *getdiskbyname();
 extern struct disklabel *getdiskbyname(const char *);
 #else
 extern struct disklabel *getdiskbyname();

diff --git a/usr/src/sys/sys/fcntl.h b/usr/src/sys/sys/fcntl.h
index 610ab6b..be104a7 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.4 (Berkeley) %G%
+ *     @(#)fcntl.h     5.5 (Berkeley) %G%

  */
 
 #ifndef F_DUPFD
  */
 
 #ifndef F_DUPFD


@@ -77,7 +77,7 @@
 /* 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)
 

-#if defined(__STDC__)
+#if __STDC__ || c_plusplus

 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, ...);

diff --git a/usr/src/sys/sys/signal.h b/usr/src/sys/sys/signal.h
index f311f7b..db8b9ab 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.8 (Berkeley) %G%
+ *     @(#)signal.h    7.9 (Berkeley) %G%

  */
 
 #ifndef        NSIG
  */
 
 #ifndef        NSIG


@@ -73,7 +73,7 @@ void  (*signal())();
 
 typedef unsigned int sigset_t;
 
 
 typedef unsigned int sigset_t;
 

-#ifdef __STDC__
+#if __STDC__ || c_plusplus

 int sigemptyset(sigset_t *);
 int sigfillset(sigset_t *);
 int sigaddset(sigset_t *, int);
 int sigemptyset(sigset_t *);
 int sigfillset(sigset_t *);
 int sigaddset(sigset_t *, int);


@@ -187,7 +187,7 @@ struct      sigcontext {
 
 #endif /* KERNEL */
 
 
 #endif /* KERNEL */
 

-#ifdef __STDC__
+#if __STDC__ || c_plusplus

 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 *);

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

  */
 
 struct stat
  */
 
 struct stat


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

-#ifdef __STDC__
+#if __STDC__ || c_plusplus

 mode_t umask(mode_t);
 int mkdir(const char *, mode_t);
 int mkfifo(const char *, mode_t);
 mode_t umask(mode_t);
 int mkdir(const char *, mode_t);
 int mkfifo(const char *, mode_t);