When testing __STDC__, consistently use #ifdef rather than #if. The Sun

Workshop 5.0 C compiler defines __STDC__ to 0 unless it's in full-ANSI mode,
and in full ANSI mode it won't give us 64-bit integers (at least on a 32-bit
CPU).
This commit is contained in:
bjh21 2002-04-22 23:31:44 +00:00
parent 1723b1333c
commit 43102f34cc
3 changed files with 10 additions and 10 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: err.c,v 1.19 2002/01/31 22:43:37 tv Exp $ */
/* $NetBSD: err.c,v 1.20 2002/04/22 23:31:44 bjh21 Exp $ */
/*-
* Copyright (c) 1993
@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)err.c 8.1 (Berkeley) 6/4/93";
#else
__RCSID("$NetBSD: err.c,v 1.19 2002/01/31 22:43:37 tv Exp $");
__RCSID("$NetBSD: err.c,v 1.20 2002/04/22 23:31:44 bjh21 Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@ -69,7 +69,7 @@ _err(va_alist)
#endif
{
va_list ap;
#if __STDC__
#ifdef __STDC__
va_start(ap, fmt);
#else
int eval;

View File

@ -1,4 +1,4 @@
/* $NetBSD: errx.c,v 1.7 2002/01/31 22:43:37 tv Exp $ */
/* $NetBSD: errx.c,v 1.8 2002/04/22 23:31:44 bjh21 Exp $ */
/*-
* Copyright (c) 1993
@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)err.c 8.1 (Berkeley) 6/4/93";
#else
__RCSID("$NetBSD: errx.c,v 1.7 2002/01/31 22:43:37 tv Exp $");
__RCSID("$NetBSD: errx.c,v 1.8 2002/04/22 23:31:44 bjh21 Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@ -61,7 +61,7 @@ __weak_alias(errx, _errx)
#endif
__dead void
#if __STDC__
#ifdef __STDC__
_errx(int eval, const char *fmt, ...)
#else
_errx(va_alist)
@ -69,7 +69,7 @@ _errx(va_alist)
#endif
{
va_list ap;
#if __STDC__
#ifdef __STDC__
va_start(ap, fmt);
#else
int eval;

View File

@ -1,4 +1,4 @@
/* $NetBSD: warn.c,v 1.7 2002/01/31 22:43:39 tv Exp $ */
/* $NetBSD: warn.c,v 1.8 2002/04/22 23:31:44 bjh21 Exp $ */
/*-
* Copyright (c) 1993
@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)err.c 8.1 (Berkeley) 6/4/93";
#else
__RCSID("$NetBSD: warn.c,v 1.7 2002/01/31 22:43:39 tv Exp $");
__RCSID("$NetBSD: warn.c,v 1.8 2002/04/22 23:31:44 bjh21 Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@ -69,7 +69,7 @@ _warn(va_alist)
#endif
{
va_list ap;
#if __STDC__
#ifdef __STDC__
va_start(ap, fmt);
#else
const char *fmt;