attributes interfered with doxygen

include/GLString.h

@@ -74,8 +74,7 @@ public:
      * \param string valid string id
      * \param s format string and args like for printf
      */
-    __attribute__((format(printf, 3, 4)))
-    void SetString(unsigned int string, const char *s, ...);
+    void SetString(unsigned int string, const char *s, ...) __attribute__((format(printf, 3, 4)));
 
     /*!
      * \brief Sets default text scaling
@@ -90,8 +89,7 @@ public:
      * \param string valid format string with args like for printf
      * \returns 0 on success, -1 on invalid string, -2 on full string list
      */
-    __attribute__((format(printf, 4, 5)))
-    int glPrintf(int x, int y, const char *string, ...);
+    int glPrintf(int x, int y, const char *string, ...) __attribute__((format(printf, 4, 5)));
 
     /*!
      * \brief Renders strings over GL scene.

include/OpenRaider.h

@@ -130,8 +130,7 @@ public:
      * \param dump_stdout if true, also print to stdout
      * \param format printf() style format string
      */
-    __attribute__((format(printf, 3, 4)))
-    void print(bool dump_stdout, const char *format, ...);
+    void print(bool dump_stdout, const char *format, ...) __attribute__((format(printf, 3, 4)));
 
 protected:
 

include/System.h

@@ -70,8 +70,7 @@ public:
      * \param string Format string like for printf
      * \returns string in a buffer
      */
-    __attribute__((format(printf, 1, 2)))
-    static char *bufferString(const char *string, ...);
+    static char *bufferString(const char *string, ...) __attribute__((format(printf, 1, 2)));
 
     /*!
      * \brief Expansion of unix home enviroment char.

include/Texture.h

@@ -249,8 +249,7 @@ private:
 
 // Experimental testing
 
-__attribute__((format(printf, 3, 4)))
-void bufferedPrintf(char *string, unsigned int len, char *s, ...);
+void bufferedPrintf(char *string, unsigned int len, char *s, ...) __attribute__((format(printf, 3, 4)));
 
 void glPrint3d(float x, float y, float z,
                 float pitch, float yaw, float roll,

include/TombRaider.h

@@ -2238,11 +2238,9 @@ private:
      * Mongoose - Created
      ------------------------------------------------------*/
 
-__attribute__((format(printf, 3, 4)))
-    void print(const char *methodName, const char *s, ...) ;
+    void print(const char *methodName, const char *s, ...) __attribute__((format(printf, 3, 4)));
 
-__attribute__((format(printf, 3, 4)))
-    void printDebug(const char *methodName, const char *s, ...);
+    void printDebug(const char *methodName, const char *s, ...) __attribute__((format(printf, 3, 4)));
 
 
     ////////////////////////////////////////////////////////////

include/tga.h

@@ -83,10 +83,8 @@ int tga_save(FILE *f, unsigned char *image,
  * \param s format string for file path/name
  * \returns 0 on success, else error condition
  */
-__attribute__((format(printf, 5, 6)))
 int tga_save_filename(unsigned char *image,
         unsigned int width, unsigned int height,
-        char type,
-        char *s, ...);
+        char type, char *s, ...) __attribute__((format(printf, 5, 6)));
 
 #endif