--- libraries/liblber/decode.c 1998/11/04 12:15:18 1.8 +++ libraries/liblber/decode.c 1998/11/06 00:18:49 1.9 @@ -19,11 +19,7 @@ #include #endif -#if defined( HAVE_STDARG_H ) && __STDC__ -#include -#else -#include -#endif +#include #include #include @@ -370,7 +366,7 @@ ber_next_element( BerElement *ber, unsig /* VARARGS */ unsigned long ber_scanf -#if defined( HAVE_STDARG_H ) && __STDC__ +#if HAVE_STDARG ( BerElement *ber, char *fmt, ... ) #else ( va_alist ) @@ -378,7 +374,7 @@ va_dcl #endif { va_list ap; -#if !(defined( HAVE_STDARG_H ) && __STDC__) +#ifndef HAVE_STDARG BerElement *ber; char *fmt; #endif @@ -389,7 +385,7 @@ va_dcl long *l; unsigned long rc, tag, len; -#if defined( HAVE_STDARG_H ) && __STDC__ +#ifdef HAVE_STDARG va_start( ap, fmt ); #else va_start( ap );