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
 }