diff --git a/src/StreamBuffer.h b/src/StreamBuffer.h
index 7eeea2c..8af6939 100644
--- a/src/StreamBuffer.h
+++ b/src/StreamBuffer.h
@@ -195,7 +195,7 @@ public:
         {return replace(pos, 0, &c, 1);}
 
     StreamBuffer& print(const char* fmt, ...)
-        __attribute__ ((format(printf,2,3)));
+        __attribute__((__format__(__printf__,2,3)));
 
     // find: get index of data in buffer or -1
     ssize_t find(char c, ssize_t start=0) const
diff --git a/src/StreamError.h b/src/StreamError.h
index be39323..e7a7580 100644
--- a/src/StreamError.h
+++ b/src/StreamError.h
@@ -32,13 +32,13 @@ extern int streamError;
 extern void (*StreamPrintTimestampFunction)(char* buffer, int size);
 
 void StreamError(int line, const char* file, const char* fmt, ...)
-__attribute__ ((format(printf,3,4)));
+__attribute__((__format__(__printf__,3,4)));
 
 void StreamVError(int line, const char* file, const char* fmt, va_list args)
-__attribute__ ((format(printf,3,0)));
+__attribute__((__format__(__printf__,3,0)));
 
 void StreamError(const char* fmt, ...)
-__attribute__ ((format(printf,1,2)));
+__attribute__((__format__(__printf__,1,2)));
 
 inline void StreamVError(const char* fmt, va_list args)
 {
@@ -53,7 +53,7 @@ public:
     StreamDebugClass(const char* file, int line) :
         file(file), line(line) {}
     int print(const char* fmt, ...)
-        __attribute__ ((format(printf,2,3)));
+        __attribute__((__format__(__printf__,2,3)));
 };
 
 inline StreamDebugClass