From f1e6a5e07cd80c5d5557dcd2ac785704c799f883 Mon Sep 17 00:00:00 2001 From: Jeff Hill Date: Tue, 5 Aug 1997 19:52:57 +0000 Subject: [PATCH] dont include stdarg.h in traditional C code --- src/libCom/epicsPrint.h | 32 +++++++++++++++++++++++--------- src/libCom/error/epicsPrint.h | 32 +++++++++++++++++++++++--------- 2 files changed, 46 insertions(+), 18 deletions(-) diff --git a/src/libCom/epicsPrint.h b/src/libCom/epicsPrint.h index e131dd8af..01f77aa3b 100644 --- a/src/libCom/epicsPrint.h +++ b/src/libCom/epicsPrint.h @@ -1,18 +1,32 @@ #ifdef __cplusplus extern "C" { +#define epicsPrintUseProtoANSI +#endif + +#ifdef __STDC__ +#ifndef epicsPrintUseProtoANSI +#define epicsPrintUseProtoANSI +#endif #endif #ifdef vxWorks -#include -int epicsPrintf(const char *pFormat, ...); -int epicsVprintf (const char *pFormat, va_list pvar); -int iocLogVPrintf(const char *pFormat, va_list pvar); -int iocLogPrintf(const char *pFormat, ...); -#else -#define epicsPrintf printf -#define epicsVprintf vprintf -#endif +# ifdef epicsPrintUseProtoANSI +# include + int epicsPrintf(const char *pFormat, ...); + int epicsVprintf (const char *pFormat, va_list pvar); + int iocLogVPrintf(const char *pFormat, va_list pvar); + int iocLogPrintf(const char *pFormat, ...); +# else /* not epicsPrintUseProtoANSI */ + int epicsPrintf(); + int epicsVprintf (); + int iocLogVPrintf(); + int iocLogPrintf(); +# endif /* ifdef epicsPrintUseProtoANSI */ +#else /* not vxWorks */ +# define epicsPrintf printf +# define epicsVprintf vprintf +#endif /* ifdef vxWorks */ #ifdef __cplusplus } diff --git a/src/libCom/error/epicsPrint.h b/src/libCom/error/epicsPrint.h index e131dd8af..01f77aa3b 100644 --- a/src/libCom/error/epicsPrint.h +++ b/src/libCom/error/epicsPrint.h @@ -1,18 +1,32 @@ #ifdef __cplusplus extern "C" { +#define epicsPrintUseProtoANSI +#endif + +#ifdef __STDC__ +#ifndef epicsPrintUseProtoANSI +#define epicsPrintUseProtoANSI +#endif #endif #ifdef vxWorks -#include -int epicsPrintf(const char *pFormat, ...); -int epicsVprintf (const char *pFormat, va_list pvar); -int iocLogVPrintf(const char *pFormat, va_list pvar); -int iocLogPrintf(const char *pFormat, ...); -#else -#define epicsPrintf printf -#define epicsVprintf vprintf -#endif +# ifdef epicsPrintUseProtoANSI +# include + int epicsPrintf(const char *pFormat, ...); + int epicsVprintf (const char *pFormat, va_list pvar); + int iocLogVPrintf(const char *pFormat, va_list pvar); + int iocLogPrintf(const char *pFormat, ...); +# else /* not epicsPrintUseProtoANSI */ + int epicsPrintf(); + int epicsVprintf (); + int iocLogVPrintf(); + int iocLogPrintf(); +# endif /* ifdef epicsPrintUseProtoANSI */ +#else /* not vxWorks */ +# define epicsPrintf printf +# define epicsVprintf vprintf +#endif /* ifdef vxWorks */ #ifdef __cplusplus }