summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorperry <perry@NetBSD.org>2005-12-24 19:12:23 +0000
committerperry <perry@NetBSD.org>2005-12-24 19:12:23 +0000
commita2cd732268201e59a69ccf2bfd390176b5c270a6 (patch)
tree3fbe88dade8c0e10a65f49e4e1b6790bed8b75e3 /include
parente14523e9437df221f7befdd807dec1d60740c4e1 (diff)
Remove leading __ from __(const|inline|signed|volatile) -- it is obsolete.
Diffstat (limited to 'include')
-rw-r--r--include/errno.h6
-rw-r--r--include/math.h10
-rw-r--r--include/rpc/xdr.h6
-rw-r--r--include/signal.h10
-rw-r--r--include/stdio.h6
-rw-r--r--include/unistd.h4
6 files changed, 21 insertions, 21 deletions
diff --git a/include/errno.h b/include/errno.h
index 16b260fb4df..988fedfa3ad 100644
--- a/include/errno.h
+++ b/include/errno.h
@@ -1,4 +1,4 @@
-/* $NetBSD: errno.h,v 1.8 2005/09/13 01:44:32 christos Exp $ */
+/* $NetBSD: errno.h,v 1.9 2005/12/24 19:16:02 perry Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -51,8 +51,8 @@ int *__errno(void);
#if defined(_NETBSD_SOURCE)
#ifndef __LIBC12_SOURCE__
-extern __const int sys_nerr __RENAME(__sys_nerr14);
-extern __const char *__const *sys_errlist __RENAME(__sys_errlist14);
+extern const int sys_nerr __RENAME(__sys_nerr14);
+extern const char *const *sys_errlist __RENAME(__sys_errlist14);
#endif
#endif
__END_DECLS
diff --git a/include/math.h b/include/math.h
index 1ab0028f2aa..ff572892850 100644
--- a/include/math.h
+++ b/include/math.h
@@ -1,4 +1,4 @@
-/* $NetBSD: math.h,v 1.41 2005/07/21 12:56:29 christos Exp $ */
+/* $NetBSD: math.h,v 1.42 2005/12/24 19:16:02 perry Exp $ */
/*
* ====================================================
@@ -59,7 +59,7 @@ union __long_double_u {
* ANSI/POSIX
*/
/* 7.12#3 HUGE_VAL, HUGELF, HUGE_VALL */
-extern __const union __double_u __infinity;
+extern const union __double_u __infinity;
#define HUGE_VAL __infinity.__val
/*
@@ -72,10 +72,10 @@ extern __const union __double_u __infinity;
((_XOPEN_SOURCE - 0) >= 600) || \
defined(_ISOC99_SOURCE) || defined(_NETBSD_SOURCE)
/* 7.12#3 HUGE_VAL, HUGELF, HUGE_VALL */
-extern __const union __float_u __infinityf;
+extern const union __float_u __infinityf;
#define HUGE_VALF __infinityf.__val
-extern __const union __long_double_u __infinityl;
+extern const union __long_double_u __infinityl;
#define HUGE_VALL __infinityl.__val
/* 7.12#4 INFINITY */
@@ -87,7 +87,7 @@ extern __const union __long_double_u __infinityl;
/* 7.12#5 NAN: a quiet NaN, if supported */
#ifdef __HAVE_NANF
-extern __const union __float_u __nanf;
+extern const union __float_u __nanf;
#define NAN __nanf.__val
#endif /* __HAVE_NANF */
diff --git a/include/rpc/xdr.h b/include/rpc/xdr.h
index 79d9efdfa47..9c328a65ec6 100644
--- a/include/rpc/xdr.h
+++ b/include/rpc/xdr.h
@@ -1,4 +1,4 @@
-/* $NetBSD: xdr.h,v 1.22 2005/02/03 04:39:33 perry Exp $ */
+/* $NetBSD: xdr.h,v 1.23 2005/12/24 19:16:02 perry Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -154,7 +154,7 @@ typedef bool_t (*xdrproc_t)(/* XDR *, void *, u_int */);
#define xdr_putlong(xdrs, longp) \
(*(xdrs)->x_ops->x_putlong)(xdrs, longp)
-static __inline int
+static inline int
xdr_getint32(XDR *xdrs, int32_t *ip)
{
long l;
@@ -165,7 +165,7 @@ xdr_getint32(XDR *xdrs, int32_t *ip)
return 1;
}
-static __inline int
+static inline int
xdr_putint32(XDR *xdrs, int32_t *ip)
{
long l;
diff --git a/include/signal.h b/include/signal.h
index 83c5e72f2ac..b2a09216611 100644
--- a/include/signal.h
+++ b/include/signal.h
@@ -1,4 +1,4 @@
-/* $NetBSD: signal.h,v 1.45 2005/09/15 13:44:41 drochner Exp $ */
+/* $NetBSD: signal.h,v 1.46 2005/12/24 19:16:02 perry Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -45,13 +45,13 @@
#include <sys/signal.h>
#if defined(_NETBSD_SOURCE)
-extern __const char *__const *sys_signame __RENAME(__sys_signame14);
+extern const char *const *sys_signame __RENAME(__sys_signame14);
#ifndef __SYS_SIGLIST_DECLARED
#define __SYS_SIGLIST_DECLARED
/* also in unistd.h */
-extern __const char *__const *sys_siglist __RENAME(__sys_siglist14);
+extern const char *const *sys_siglist __RENAME(__sys_siglist14);
#endif /* __SYS_SIGLIST_DECLARED */
-extern __const int sys_nsig __RENAME(__sys_nsig14);
+extern const int sys_nsig __RENAME(__sys_nsig14);
#endif
__BEGIN_DECLS
@@ -91,7 +91,7 @@ int *__errno(void);
#define errno (*__errno())
#endif
#ifndef _SIGINLINE
-#define _SIGINLINE extern __inline
+#define _SIGINLINE extern inline
#endif
_SIGINLINE int
sigaddset(sigset_t *set, int signo)
diff --git a/include/stdio.h b/include/stdio.h
index b871646d125..0ed8ea3e686 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -1,4 +1,4 @@
-/* $NetBSD: stdio.h,v 1.61 2005/05/25 20:45:38 kleink Exp $ */
+/* $NetBSD: stdio.h,v 1.62 2005/12/24 19:16:02 perry Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -389,7 +389,7 @@ int vfscanf(FILE * __restrict, const char * __restrict,
int vsscanf(const char * __restrict, const char * __restrict,
_BSD_VA_LIST_)
__attribute__((__format__(__scanf__, 2, 0)));
-__const char *fmtcheck(const char *, const char *)
+const char *fmtcheck(const char *, const char *)
__attribute__((__format_arg__(2)));
__END_DECLS
@@ -421,7 +421,7 @@ __END_DECLS
*/
#define __sgetc(p) (--(p)->_r < 0 ? __srget(p) : (int)(*(p)->_p++))
#if defined(__GNUC__) && defined(__STDC__)
-static __inline int __sputc(int _c, FILE *_p) {
+static inline int __sputc(int _c, FILE *_p) {
if (--_p->_w >= 0 || (_p->_w >= _p->_lbfsize && (char)_c != '\n'))
return (*_p->_p++ = _c);
else
diff --git a/include/unistd.h b/include/unistd.h
index 121f57e75e1..fd08a23846f 100644
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -1,4 +1,4 @@
-/* $NetBSD: unistd.h,v 1.108 2005/09/26 12:52:42 kleink Exp $ */
+/* $NetBSD: unistd.h,v 1.109 2005/12/24 19:16:02 perry Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -356,7 +356,7 @@ int iruserok_sa(const void *, int, int, const char *, const char *);
#ifndef __SYS_SIGLIST_DECLARED
#define __SYS_SIGLIST_DECLARED
/* also in signal.h */
-extern __const char *__const *sys_siglist __RENAME(__sys_siglist14);
+extern const char *const *sys_siglist __RENAME(__sys_siglist14);
#endif /* __SYS_SIGLIST_DECLARED */
extern int optreset; /* getopt(3) external variable */
extern char *suboptarg; /* getsubopt(3) external variable */