From 3d1dfa5dc6163ba05537368f90c57bd46535c3c0 Mon Sep 17 00:00:00 2001 From: "W. Eric Norum" Date: Mon, 12 Jul 2004 16:00:48 +0000 Subject: [PATCH] Simplify printf ==>> epicsStdoutPrintf redefinition. Use __printf__ in GCC attribute specifier to avoid conflict. --- src/libCom/misc/compilerDependencies.h | 2 +- src/libCom/osi/epicsStdio.h | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/libCom/misc/compilerDependencies.h b/src/libCom/misc/compilerDependencies.h index adec8fb47..3f3003737 100644 --- a/src/libCom/misc/compilerDependencies.h +++ b/src/libCom/misc/compilerDependencies.h @@ -88,7 +88,7 @@ * Enable format-string checking if possible */ #ifdef __GNUC__ -# define EPICS_PRINTF_STYLE(f,a) __attribute__((format(printf,f,a))) +# define EPICS_PRINTF_STYLE(f,a) __attribute__((format(__printf__,f,a))) #else # define EPICS_PRINTF_STYLE(f,a) #endif diff --git a/src/libCom/osi/epicsStdio.h b/src/libCom/osi/epicsStdio.h index 7c3d52f06..57da12c4c 100644 --- a/src/libCom/osi/epicsStdio.h +++ b/src/libCom/osi/epicsStdio.h @@ -66,15 +66,7 @@ epicsShareFunc int epicsShareAPI epicsStdoutPrintf( #ifdef printf #undef printf #endif /*printf*/ -#if defined(__STDC_VERSION__) && __STDC_VERSION__>=199901L -#define printf(...) epicsStdoutPrintf(...) -#elif defined(__GNUC__) -#define printf(format...) epicsStdoutPrintf(format) -#else #define printf epicsStdoutPrintf -#endif /* defined(__STDC_VERSION__) && __STDC_VERSION__>=199901_*/ -#endif /* epicsStdioPVT */ - #ifdef __cplusplus }