diff options
| -rw-r--r-- | sys/ddb/db_output.h | 4 | ||||
| -rw-r--r-- | sys/sys/cdefs.h | 16 | ||||
| -rw-r--r-- | sys/sys/syslog.h | 6 | ||||
| -rw-r--r-- | sys/sys/systm.h | 24 | ||||
| -rw-r--r-- | sys/sys/tprintf.h | 4 |
5 files changed, 17 insertions, 37 deletions
diff --git a/sys/ddb/db_output.h b/sys/ddb/db_output.h index 58aa5cd4447..2a9630c9123 100644 --- a/sys/ddb/db_output.h +++ b/sys/ddb/db_output.h @@ -1,4 +1,4 @@ -/* $OpenBSD: db_output.h,v 1.13 2003/06/28 01:52:18 tedu Exp $ */ +/* $OpenBSD: db_output.h,v 1.14 2003/08/24 01:27:07 avsm Exp $ */ /* $NetBSD: db_output.h,v 1.9 1996/04/04 05:13:50 cgd Exp $ */ /* @@ -37,7 +37,7 @@ void db_force_whitespace(void); void db_putchar(int); int db_print_position(void); int db_printf(const char *, ...) - __kprintf_attribute__((__format__(__kprintf__,1,2))); + __attribute__((__format__(__kprintf__,1,2))); void db_end_line(int); extern int db_log; diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h index d4e271e0a66..9fac7c792a0 100644 --- a/sys/sys/cdefs.h +++ b/sys/sys/cdefs.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cdefs.h,v 1.9 2003/06/02 23:28:20 millert Exp $ */ +/* $OpenBSD: cdefs.h,v 1.10 2003/08/24 01:27:07 avsm Exp $ */ /* $NetBSD: cdefs.h,v 1.16 1996/04/03 20:46:39 christos Exp $ */ /* @@ -38,14 +38,6 @@ #ifndef _CDEFS_H_ #define _CDEFS_H_ -/* - * Gratuitous NetBSD gcc extensions we can do without. - */ - -#ifdef __KPRINTF_ATTRIBUTE__ -#undef __KPRINTF_ATTRIBUTE__ -#endif - #include <machine/cdefs.h> #if defined(__cplusplus) @@ -171,12 +163,6 @@ #define __predict_false(exp) ((exp) != 0) #endif -#ifdef __KPRINTF_ATTRIBUTE__ -#define __kprintf_attribute__(a) __attribute__(a) -#else -#define __kprintf_attribute__(a) -#endif - /* Delete pseudo-keywords wherever they are not available or needed. */ #ifndef __dead #define __dead diff --git a/sys/sys/syslog.h b/sys/sys/syslog.h index 7c4902a79cb..8b003e9a831 100644 --- a/sys/sys/syslog.h +++ b/sys/sys/syslog.h @@ -1,4 +1,4 @@ -/* $OpenBSD: syslog.h,v 1.10 2003/06/02 23:28:22 millert Exp $ */ +/* $OpenBSD: syslog.h,v 1.11 2003/08/24 01:27:07 avsm Exp $ */ /* $NetBSD: syslog.h,v 1.14 1996/04/03 20:46:44 christos Exp $ */ /* @@ -212,9 +212,9 @@ __END_DECLS void logpri(int); void log(int, const char *, ...) - __kprintf_attribute__((__format__(__kprintf__,2,3))); + __attribute__((__format__(__kprintf__,2,3))); int addlog(const char *, ...) - __kprintf_attribute__((__format__(__kprintf__,1,2))); + __attribute__((__format__(__kprintf__,1,2))); void logwakeup(void); #endif /* !_KERNEL */ diff --git a/sys/sys/systm.h b/sys/sys/systm.h index 77cde4d86c0..d42328131be 100644 --- a/sys/sys/systm.h +++ b/sys/sys/systm.h @@ -1,4 +1,4 @@ -/* $OpenBSD: systm.h,v 1.57 2003/07/21 22:44:49 tedu Exp $ */ +/* $OpenBSD: systm.h,v 1.58 2003/08/24 01:27:07 avsm Exp $ */ /* $NetBSD: systm.h,v 1.50 1996/06/09 04:55:09 briggs Exp $ */ /*- @@ -154,29 +154,23 @@ void *hashinit(int, int, int, u_long *); int sys_nosys(struct proc *, void *, register_t *); void panic(const char *, ...) -#ifdef __KPRINTF_ATTRIBUTE__ - __kprintf_attribute__((__noreturn__,__format__(__kprintf__,1,2))); -#else - __attribute__((__noreturn__)); -#endif + __attribute__((__noreturn__,__format__(__kprintf__,1,2))); void __assert(const char *, const char *, int, const char *) __attribute__((__noreturn__)); int printf(const char *, ...) - __kprintf_attribute__((__format__(__kprintf__,1,2))); + __attribute__((__format__(__kprintf__,1,2))); void uprintf(const char *, ...) - __kprintf_attribute__((__format__(__kprintf__,1,2))); + __attribute__((__format__(__kprintf__,1,2))); int vprintf(const char *, _BSD_VA_LIST_); -int vsprintf(char *, const char *, va_list) - __kprintf_attribute__((__format__(__kprintf__,2,3))); +int vsprintf(char *, const char *, va_list); int sprintf(char *buf, const char *, ...) - __kprintf_attribute__((__format__(__kprintf__,2,3))); -int vsnprintf(char *, size_t, const char *, va_list) - __kprintf_attribute__((__format__(__kprintf__,3,4))); + __attribute__((__format__(__kprintf__,2,3))); +int vsnprintf(char *, size_t, const char *, va_list); int snprintf(char *buf, size_t, const char *, ...) - __kprintf_attribute__((__format__(__kprintf__,3,4))); + __attribute__((__format__(__kprintf__,3,4))); struct tty; void ttyprintf(struct tty *, const char *, ...) - __kprintf_attribute__((__format__(__kprintf__,2,3))); + __attribute__((__format__(__kprintf__,2,3))); void splassert_fail(int, int, const char *); extern int splassert_ctl; diff --git a/sys/sys/tprintf.h b/sys/sys/tprintf.h index b72350d601a..e17877c9f3f 100644 --- a/sys/sys/tprintf.h +++ b/sys/sys/tprintf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tprintf.h,v 1.5 2003/06/02 23:28:22 millert Exp $ */ +/* $OpenBSD: tprintf.h,v 1.6 2003/08/24 01:27:07 avsm Exp $ */ /* $NetBSD: tprintf.h,v 1.10 1996/04/09 20:55:43 cgd Exp $ */ /*- @@ -38,4 +38,4 @@ tpr_t tprintf_open(struct proc *); void tprintf_close(tpr_t); void tprintf(tpr_t, const char *fmt, ...) - __kprintf_attribute__((__format__(__kprintf__,2,3))); + __attribute__((__format__(__kprintf__,2,3))); |