diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2002-02-19 19:39:42 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2002-02-19 19:39:42 +0000 |
| commit | 3923126b85f9e8a77cab9a41b5a62125acd5b4cd (patch) | |
| tree | 1a8b19c5db03f8c989fc8228811837b182feb7a3 /include | |
| parent | cc03bdb70090357d2393b6ec82e3cde4d5ce5edd (diff) | |
We live in an ANSI C world. Remove lots of gratuitous #ifdef __STDC__ cruft.
Diffstat (limited to 'include')
| -rw-r--r-- | include/assert.h | 6 | ||||
| -rw-r--r-- | include/signal.h | 4 | ||||
| -rw-r--r-- | include/stdio.h | 4 |
3 files changed, 5 insertions, 9 deletions
diff --git a/include/assert.h b/include/assert.h index b5951f6d344..17d2dbf92cd 100644 --- a/include/assert.h +++ b/include/assert.h @@ -1,4 +1,4 @@ -/* $OpenBSD: assert.h,v 1.3 2002/02/16 21:27:17 millert Exp $ */ +/* $OpenBSD: assert.h,v 1.4 2002/02/19 19:39:36 millert Exp $ */ /* $NetBSD: assert.h,v 1.6 1994/10/26 00:55:44 cgd Exp $ */ /*- @@ -54,11 +54,7 @@ #define _assert(e) ((void)0) #else #define _assert(e) assert(e) -#ifdef __STDC__ #define assert(e) ((e) ? (void)0 : __assert(__FILE__, __LINE__, #e)) -#else /* PCC */ -#define assert(e) ((e) ? (void)0 : __assert(__FILE__, __LINE__, "e")) -#endif #endif #include <sys/cdefs.h> diff --git a/include/signal.h b/include/signal.h index 84d20e6280c..193a546b981 100644 --- a/include/signal.h +++ b/include/signal.h @@ -1,4 +1,4 @@ -/* $OpenBSD: signal.h,v 1.5 2002/02/16 21:27:17 millert Exp $ */ +/* $OpenBSD: signal.h,v 1.6 2002/02/19 19:39:36 millert Exp $ */ /* $NetBSD: signal.h,v 1.8 1996/02/29 00:04:57 jtc Exp $ */ /*- @@ -64,7 +64,7 @@ int sigpending(sigset_t *); int sigprocmask(int, const sigset_t *, sigset_t *); int sigsuspend(const sigset_t *); -#if defined(__GNUC__) && defined(__STDC__) +#if defined(__GNUC__) extern __inline int sigaddset(sigset_t *set, int signo) { extern int errno; diff --git a/include/stdio.h b/include/stdio.h index d6f64a65ad8..7918650e097 100644 --- a/include/stdio.h +++ b/include/stdio.h @@ -1,4 +1,4 @@ -/* $OpenBSD: stdio.h,v 1.21 2002/02/17 19:42:21 millert Exp $ */ +/* $OpenBSD: stdio.h,v 1.22 2002/02/19 19:39:36 millert Exp $ */ /* $NetBSD: stdio.h,v 1.18 1996/04/25 18:29:21 jtc Exp $ */ /*- @@ -366,7 +366,7 @@ __END_DECLS * define function versions in the C library. */ #define __sgetc(p) (--(p)->_r < 0 ? __srget(p) : (int)(*(p)->_p++)) -#if defined(__GNUC__) && defined(__STDC__) +#if defined(__GNUC__) static __inline int __sputc(int _c, FILE *_p) { if (--_p->_w >= 0 || (_p->_w >= _p->_lbfsize && (char)_c != '\n')) return (*_p->_p++ = _c); |