Wrap __attribute__s in macros

code/ui/ui_local.h

@@ -918,7 +918,7 @@ void UI_SPSkillMenu_Cache( void );
 // ui_syscalls.c
 //
 void			trap_Print( const char *string );
-void			trap_Error(const char *string) __attribute__((noreturn));
+void			trap_Error(const char *string) Q_NO_RETURN;
 int				trap_Milliseconds( void );
 void			trap_Cvar_Register( vmCvar_t *vmCvar, const char *varName, const char *defaultValue, int flags );
 void			trap_Cvar_Update( vmCvar_t *vmCvar );

code/ui/ui_shared.c

@@ -255,7 +255,7 @@ void String_Init(void) {
 PC_SourceWarning
 =================
 */
-static __attribute__ ((format (printf, 2, 3))) void PC_SourceWarning(int handle, char *format, ...) {
+static Q_PRINTF_FUNC(2, 3) void PC_SourceWarning(int handle, char *format, ...) {
 	int line;
 	char filename[128];
 	va_list argptr;
@@ -278,7 +278,7 @@ static __attribute__ ((format (printf, 2, 3))) void PC_SourceWarning(int handle,
 PC_SourceError
 =================
 */
-static __attribute__ ((format (printf, 2, 3))) void PC_SourceError(int handle, char *format, ...) {
+static Q_PRINTF_FUNC(2, 3) void PC_SourceError(int handle, char *format, ...) {
 	int line;
 	char filename[128];
 	va_list argptr;

code/ui/ui_shared.h

@@ -355,8 +355,8 @@ typedef struct {
 	void (*getBindingBuf)( int keynum, char *buf, int buflen );
 	void (*setBinding)( int keynum, const char *binding );
 	void (*executeText)(int exec_when, const char *text );	
-	void (*Error)(int level, const char *error, ...) __attribute__ ((noreturn, format (printf, 2, 3)));
-	void (*Print)(const char *msg, ...) __attribute__ ((format (printf, 1, 2)));
+	void (*Error)(int level, const char *error, ...) Q_NO_RETURN Q_PRINTF_FUNC(2, 3);
+	void (*Print)(const char *msg, ...) Q_PRINTF_FUNC(1, 2);
 	void (*Pause)(qboolean b);
 	int (*ownerDrawWidth)(int ownerDraw, float scale);
 	sfxHandle_t (*registerSound)(const char *name, qboolean compressed);