diff options
| -rw-r--r-- | include/netdb.h | 2 | ||||
| -rw-r--r-- | include/regex.h | 2 | ||||
| -rw-r--r-- | include/signal.h | 6 | ||||
| -rw-r--r-- | include/stdio.h | 4 | ||||
| -rw-r--r-- | include/stdlib.h | 2 | ||||
| -rw-r--r-- | sys/dev/uart/uart_subr.c | 12 | ||||
| -rw-r--r-- | sys/sys/types.h | 2 | ||||
| -rw-r--r-- | usr.bin/mail/extern.h | 2 | ||||
| -rw-r--r-- | usr.bin/mail/lex.c | 2 |
9 files changed, 17 insertions, 17 deletions
diff --git a/include/netdb.h b/include/netdb.h index 2c2e4b3..9ed6e61 100644 --- a/include/netdb.h +++ b/include/netdb.h @@ -276,7 +276,7 @@ int getservbyport_r(int, const char *, struct servent *, char *, int getservent_r(struct servent *, char *, size_t, struct servent **); void herror(const char *); -__const char *hstrerror(int); +const char *hstrerror(int); int innetgr(const char *, const char *, const char *, const char *); void setnetgrent(const char *); #endif diff --git a/include/regex.h b/include/regex.h index fb9b99c..e8b185c 100644 --- a/include/regex.h +++ b/include/regex.h @@ -51,7 +51,7 @@ typedef __size_t size_t; 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; diff --git a/include/signal.h b/include/signal.h index 32b9e6b..e7447df 100644 --- a/include/signal.h +++ b/include/signal.h @@ -42,9 +42,9 @@ * XXX should enlarge these, if only to give empty names instead of bounds * errors for large signal numbers. */ -extern __const char *__const sys_signame[NSIG]; -extern __const char *__const sys_siglist[NSIG]; -extern __const int sys_nsig; +extern const char * const sys_signame[NSIG]; +extern const char * const sys_siglist[NSIG]; +extern const int sys_nsig; #endif #if __POSIX_VISIBLE >= 200112 || __XSI_VISIBLE diff --git a/include/stdio.h b/include/stdio.h index bbeb0de..b72bfd4 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -404,8 +404,8 @@ int vasprintf(char **, const char *, __va_list) * positive errno values. Use strerror() or strerror_r() from <string.h> * instead. */ -extern __const int sys_nerr; -extern __const char *__const sys_errlist[]; +extern const int sys_nerr; +extern const char * const sys_errlist[]; /* * Stdio function-access interface. diff --git a/include/stdlib.h b/include/stdlib.h index c19eef0..58362dd 100644 --- a/include/stdlib.h +++ b/include/stdlib.h @@ -271,7 +271,7 @@ char *devname_r(__dev_t, __mode_t, char *, int); char *fdevname(int); char *fdevname_r(int, char *, int); int getloadavg(double [], int); -__const char * +const char * getprogname(void); int heapsort(void *, size_t, size_t, int (*)(const void *, const void *)); diff --git a/sys/dev/uart/uart_subr.c b/sys/dev/uart/uart_subr.c index 6b32c24..5a3f16f 100644 --- a/sys/dev/uart/uart_subr.c +++ b/sys/dev/uart/uart_subr.c @@ -56,13 +56,13 @@ static struct uart_class *uart_classes[] = { static size_t uart_nclasses = sizeof(uart_classes) / sizeof(uart_classes[0]); static bus_addr_t -uart_parse_addr(__const char **p) +uart_parse_addr(const char **p) { return (strtoul(*p, (char**)(uintptr_t)p, 0)); } static struct uart_class * -uart_parse_class(struct uart_class *class, __const char **p) +uart_parse_class(struct uart_class *class, const char **p) { struct uart_class *uc; const char *nm; @@ -84,13 +84,13 @@ uart_parse_class(struct uart_class *class, __const char **p) } static long -uart_parse_long(__const char **p) +uart_parse_long(const char **p) { return (strtol(*p, (char**)(uintptr_t)p, 0)); } static int -uart_parse_parity(__const char **p) +uart_parse_parity(const char **p) { if (!strncmp(*p, "even", 4)) { *p += 4; @@ -116,7 +116,7 @@ uart_parse_parity(__const char **p) } static int -uart_parse_tag(__const char **p) +uart_parse_tag(const char **p) { int tag; @@ -192,7 +192,7 @@ out: int uart_getenv(int devtype, struct uart_devinfo *di, struct uart_class *class) { - __const char *spec; + const char *spec; bus_addr_t addr = ~0U; int error; diff --git a/sys/sys/types.h b/sys/sys/types.h index 43c29d6..d2256e7 100644 --- a/sys/sys/types.h +++ b/sys/sys/types.h @@ -72,7 +72,7 @@ typedef __int64_t quad_t; typedef quad_t * qaddr_t; typedef char * caddr_t; /* core address */ -typedef __const char * c_caddr_t; /* core address, pointer to const */ +typedef const char * c_caddr_t; /* core address, pointer to const */ typedef __volatile char *v_caddr_t; /* core address, pointer to volatile */ #ifndef _BLKSIZE_T_DECLARED diff --git a/usr.bin/mail/extern.h b/usr.bin/mail/extern.h index f5f2872..2578d65 100644 --- a/usr.bin/mail/extern.h +++ b/usr.bin/mail/extern.h @@ -154,7 +154,7 @@ int ishead(char []); int isign(const char *, struct ignoretab []); int isprefix(const char *, const char *); void istrncpy(char *, const char *, size_t); -__const struct cmd * +const struct cmd * lex(char []); void load(char *); struct var * diff --git a/usr.bin/mail/lex.c b/usr.bin/mail/lex.c index 3232001..4d799e7 100644 --- a/usr.bin/mail/lex.c +++ b/usr.bin/mail/lex.c @@ -482,7 +482,7 @@ setmsize(int sz) * to the passed command "word" */ -__const struct cmd * +const struct cmd * lex(char word[]) { const struct cmd *cp; |
