use latest BSDI version of <sys/cdefs.h>, change to __keyword

SCCS-vsn: include/ctype.h 8.2
SCCS-vsn: lib/libedit/histedit.h 8.2
SCCS-vsn: include/regex.h 8.2
SCCS-vsn: include/signal.h 8.2
SCCS-vsn: include/stdio.h 8.3
SCCS-vsn: include/unistd.h 8.3

diff --git a/usr/src/include/ctype.h b/usr/src/include/ctype.h
index b13e49b..e2c522c 100644 (file)
--- a/usr/src/include/ctype.h
+++ b/usr/src/include/ctype.h
@@ -7,7 +7,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)ctype.h     8.1 (Berkeley) %G%
+ *     @(#)ctype.h     8.2 (Berkeley) %G%

  */
 
 #ifndef        _CTYPE_H_
  */
 
 #ifndef        _CTYPE_H_


@@ -74,14 +74,14 @@ __END_DECLS
 #endif
 
 #if defined(_USE_CTYPE_INLINE_)
 #endif
 
 #if defined(_USE_CTYPE_INLINE_)

-static inline int
+static __inline int

 __istype(_BSD_RUNE_T_ c, unsigned long f)
 {
        return((((c & _CRMASK) ? ___runetype(c) :
            _CurrentRuneLocale->runetype[c]) & f) ? 1 : 0);
 }
 
 __istype(_BSD_RUNE_T_ c, unsigned long f)
 {
        return((((c & _CRMASK) ? ___runetype(c) :
            _CurrentRuneLocale->runetype[c]) & f) ? 1 : 0);
 }
 

-static inline int
+static __inline int

 __isctype(_BSD_RUNE_T_ c, unsigned long f)
 {
        return((((c & _CRMASK) ? 0 :
 __isctype(_BSD_RUNE_T_ c, unsigned long f)
 {
        return((((c & _CRMASK) ? 0 :


@@ -90,14 +90,14 @@ __isctype(_BSD_RUNE_T_ c, unsigned long f)
 
 /* _ANSI_LIBRARY is defined by lib/libc/gen/isctype.c. */
 #if !defined(_ANSI_LIBRARY)
 
 /* _ANSI_LIBRARY is defined by lib/libc/gen/isctype.c. */
 #if !defined(_ANSI_LIBRARY)

-static inline _BSD_RUNE_T_
+static __inline _BSD_RUNE_T_

 toupper(_BSD_RUNE_T_ c)
 {
        return((c & _CRMASK) ?
            ___toupper(c) : _CurrentRuneLocale->mapupper[c]);
 }
 
 toupper(_BSD_RUNE_T_ c)
 {
        return((c & _CRMASK) ?
            ___toupper(c) : _CurrentRuneLocale->mapupper[c]);
 }
 

-static inline _BSD_RUNE_T_
+static __inline _BSD_RUNE_T_

 tolower(_BSD_RUNE_T_ c)
 {
        return((c & _CRMASK) ?
 tolower(_BSD_RUNE_T_ c)
 {
        return((c & _CRMASK) ?

diff --git a/usr/src/include/regex.h b/usr/src/include/regex.h
index fd84052..77c027d 100644 (file)
--- a/usr/src/include/regex.h
+++ b/usr/src/include/regex.h
@@ -8,7 +8,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)regex.h     8.1 (Berkeley) %G%
+ *     @(#)regex.h     8.2 (Berkeley) %G%

  */
 
 #ifndef _REGEX_H_
  */
 
 #ifndef _REGEX_H_


@@ -22,7 +22,7 @@ typedef off_t regoff_t;
 typedef struct {
        int re_magic;
        size_t re_nsub;         /* number of parenthesized subexpressions */
 typedef struct {
        int re_magic;
        size_t re_nsub;         /* number of parenthesized subexpressions */

-       const char *re_endp;    /* end pointer for REG_PEND */
+       __const char *re_endp;  /* end pointer for REG_PEND */

        struct re_guts *re_g;   /* none of your business :-) */
 } regex_t;
 
        struct re_guts *re_g;   /* none of your business :-) */
 } regex_t;
 

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

- *     @(#)signal.h    8.1 (Berkeley) %G%
+ *     @(#)signal.h    8.2 (Berkeley) %G%

  */
 
 #ifndef _USER_SIGNAL_H
  */
 
 #ifndef _USER_SIGNAL_H


@@ -15,8 +15,8 @@
 #include <sys/signal.h>
 
 #if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE)
 #include <sys/signal.h>
 
 #if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE)

-extern const char *const sys_signame[NSIG];
-extern const char *const sys_siglist[NSIG];
+extern __const char *__const sys_signame[NSIG];
+extern __const char *__const sys_siglist[NSIG];

 #endif
 
 __BEGIN_DECLS
 #endif
 
 __BEGIN_DECLS

diff --git a/usr/src/include/stdio.h b/usr/src/include/stdio.h
index 08bd35d..5692bfd 100644 (file)
--- a/usr/src/include/stdio.h
+++ b/usr/src/include/stdio.h
@@ -7,7 +7,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)stdio.h     8.2 (Berkeley) %G%
+ *     @(#)stdio.h     8.3 (Berkeley) %G%

  */
 
 #ifndef        _STDIO_H_
  */
 
 #ifndef        _STDIO_H_


@@ -214,7 +214,7 @@ int  getchar __P((void));
 char   *gets __P((char *));
 #if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE)
 extern int sys_nerr;                   /* perror(3) external variables */
 char   *gets __P((char *));
 #if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE)
 extern int sys_nerr;                   /* perror(3) external variables */

-extern const char *const sys_errlist[];
+extern __const char *__const sys_errlist[];

 #endif
 void    perror __P((const char *));
 int     printf __P((const char *, ...));
 #endif
 void    perror __P((const char *));
 int     printf __P((const char *, ...));

diff --git a/usr/src/include/unistd.h b/usr/src/include/unistd.h
index f34c012..9ca9f07 100644 (file)
--- a/usr/src/include/unistd.h
+++ b/usr/src/include/unistd.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)unistd.h    8.2 (Berkeley) %G%
+ *     @(#)unistd.h    8.3 (Berkeley) %G%

  */
 
 #ifndef _UNISTD_H_
  */
 
 #ifndef _UNISTD_H_


@@ -107,7 +107,7 @@ char        *mktemp __P((char *));
 int     nfssvc __P((int, caddr_t));
 int     nice __P((int));
 void    psignal __P((unsigned int, const char *));
 int     nfssvc __P((int, caddr_t));
 int     nice __P((int));
 void    psignal __P((unsigned int, const char *));

-extern const char *const sys_siglist[];
+extern __const char *__const sys_siglist[];

 int     profil __P((char *, int, int, int));
 int     rcmd __P((char **, int, const char *,
                const char *, const char *, int *));
 int     profil __P((char *, int, int, int));
 int     rcmd __P((char **, int, const char *,
                const char *, const char *, int *));

diff --git a/usr/src/lib/libedit/histedit.h b/usr/src/lib/libedit/histedit.h
index ce1d8c1..75dbd59 100644 (file)
--- a/usr/src/lib/libedit/histedit.h
+++ b/usr/src/lib/libedit/histedit.h
@@ -7,7 +7,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)histedit.h  8.1 (Berkeley) %G%
+ *     @(#)histedit.h  8.2 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -28,9 +28,9 @@ typedef struct editline EditLine;
  * For user-defined function interface
  */
 typedef struct lineinfo {
  * For user-defined function interface
  */
 typedef struct lineinfo {

-    const char *buffer;
-    const char *cursor;
-    const char *lastchar;
+    __const char *buffer;
+    __const char *cursor;
+    __const char *lastchar;

 } LineInfo;
 
 
 } LineInfo;
 
 


@@ -58,7 +58,7 @@ void           el_end         __P((EditLine *));
 /*
  * Get a line, a character or push a string back in the input queue
  */
 /*
  * Get a line, a character or push a string back in the input queue
  */

-const char      *el_gets       __P((EditLine *, int *));
+__const char    *el_gets       __P((EditLine *, int *));

 int             el_getc        __P((EditLine *, char *));
 void            el_push        __P((EditLine *, const char *));
 
 int             el_getc        __P((EditLine *, char *));
 void            el_push        __P((EditLine *, const char *));
 


@@ -105,9 +105,9 @@ void                 el_resize      __P((EditLine *));
 /*
  * User-defined function interface.
  */
 /*
  * User-defined function interface.
  */

-const LineInfo *el_line        __P((EditLine *));
-int             el_insertstr   __P((EditLine *, char *));
-void            el_deletestr   __P((EditLine *, int));
+__const LineInfo *el_line      __P((EditLine *));
+int              el_insertstr  __P((EditLine *, char *));
+void             el_deletestr  __P((EditLine *, int));

 
 /*
  * ==== History ====
 
 /*
  * ==== History ====


@@ -116,8 +116,8 @@ void                 el_deletestr   __P((EditLine *, int));
 typedef struct history History;
 
 typedef struct HistEvent {
 typedef struct history History;
 
 typedef struct HistEvent {

-    int        num;
-    const char* str;
+    int          num;
+    __const char *str;

 } HistEvent;
 
 /*
 } HistEvent;
 
 /*


@@ -126,7 +126,7 @@ typedef struct HistEvent {
 History *              history_init    __P((void));
 void                   history_end     __P((History *));
 
 History *              history_init    __P((void));
 void                   history_end     __P((History *));
 

-const HistEvent *      history         __P((History *, int, ...));
+__const HistEvent *    history         __P((History *, int, ...));

 
 #define H_FUNC          0      /* , UTSL               */
 #define H_EVENT                 1      /* , const int);        */
 
 #define H_FUNC          0      /* , UTSL               */
 #define H_EVENT                 1      /* , const int);        */