Use standard attribute declarations

13 files changed, 17 insertions, 16 deletions

diff --git a/alc/alcontext.h b/alc/alcontext.h
index d62fc7d5..73a6617e 100644
--- a/alc/alcontext.h
+++ b/alc/alcontext.h
@@ -19,7 +19,6 @@
 #include "atomic.h"
 #include "inprogext.h"
 #include "intrusive_ptr.h"
-#include "logging.h"
 #include "threads.h"
 #include "vector.h"
 #include "voice.h"
@@ -222,7 +221,7 @@ struct ALCcontext : public al::intrusive_ref<ALCcontext> {
     /** Resumes update processing after being deferred. */
     void processUpdates();
 
-    void setError(ALenum errorCode, const char *msg, ...) DECL_FORMAT(printf, 3, 4);
+    [[gnu::format(printf,3,4)]] void setError(ALenum errorCode, const char *msg, ...);
 
     DEF_NEWDEL(ALCcontext)
 };
diff --git a/alc/alu.h b/alc/alu.h
index 7b2ac627..b78a3222 100644
--- a/alc/alu.h
+++ b/alc/alu.h
@@ -9,7 +9,6 @@
 
 #include "alcmain.h"
 #include "alspan.h"
-#include "logging.h"
 
 struct ALbufferlistitem;
 struct ALeffectslot;
@@ -152,7 +151,7 @@ inline std::array<float,MAX_AMBI_CHANNELS> GetAmbiIdentityRow(size_t i) noexcept
 void aluMixData(ALCdevice *device, void *OutBuffer, const ALuint NumSamples,
     const size_t FrameStep);
 /* Caller must lock the device state, and the mixer must not be running. */
-void aluHandleDisconnect(ALCdevice *device, const char *msg, ...) DECL_FORMAT(printf, 2, 3);
+[[gnu::format(printf,2,3)]] void aluHandleDisconnect(ALCdevice *device, const char *msg, ...);
 
 extern const float ConeScale;
 extern const float ZScale;
diff --git a/alc/backends/coreaudio.cpp b/alc/backends/coreaudio.cpp
index 6201ca47..df889439 100644
--- a/alc/backends/coreaudio.cpp
+++ b/alc/backends/coreaudio.cpp
@@ -31,6 +31,7 @@
 #include "alu.h"
 #include "ringbuffer.h"
 #include "converter.h"
+#include "logging.h"
 #include "backends/base.h"
 
 #include <unistd.h>
diff --git a/alc/backends/dsound.cpp b/alc/backends/dsound.cpp
index e2445cda..68b63a50 100644
--- a/alc/backends/dsound.cpp
+++ b/alc/backends/dsound.cpp
@@ -47,9 +47,10 @@
 #include "alcmain.h"
 #include "alexcpt.h"
 #include "alu.h"
-#include "ringbuffer.h"
 #include "compat.h"
 #include "dynload.h"
+#include "logging.h"
+#include "ringbuffer.h"
 #include "strutils.h"
 #include "threads.h"
 
diff --git a/alc/backends/jack.cpp b/alc/backends/jack.cpp
index 33a535de..a8d54f88 100644
--- a/alc/backends/jack.cpp
+++ b/alc/backends/jack.cpp
@@ -34,6 +34,7 @@
 #include "alconfig.h"
 #include "alexcpt.h"
 #include "dynload.h"
+#include "logging.h"
 #include "ringbuffer.h"
 #include "threads.h"
 
diff --git a/alc/backends/opensl.cpp b/alc/backends/opensl.cpp
index ad85e5fb..83054121 100644
--- a/alc/backends/opensl.cpp
+++ b/alc/backends/opensl.cpp
@@ -37,6 +37,7 @@
 #include "alu.h"
 #include "compat.h"
 #include "endiantest.h"
+#include "logging.h"
 #include "ringbuffer.h"
 #include "threads.h"
 
diff --git a/alc/backends/portaudio.cpp b/alc/backends/portaudio.cpp
index 29715554..18338917 100644
--- a/alc/backends/portaudio.cpp
+++ b/alc/backends/portaudio.cpp
@@ -32,6 +32,7 @@
 #include "alconfig.h"
 #include "dynload.h"
 #include "ringbuffer.h"
+#include "logging.h"
 
 #include <portaudio.h>
 
diff --git a/alc/backends/pulseaudio.cpp b/alc/backends/pulseaudio.cpp
index da37b9b5..9ca178c1 100644
--- a/alc/backends/pulseaudio.cpp
+++ b/alc/backends/pulseaudio.cpp
@@ -41,6 +41,7 @@
 #include "alexcpt.h"
 #include "compat.h"
 #include "dynload.h"
+#include "logging.h"
 #include "strutils.h"
 
 #include <pulse/pulseaudio.h>
diff --git a/alc/backends/sndio.cpp b/alc/backends/sndio.cpp
index 7ca11430..73948a82 100644
--- a/alc/backends/sndio.cpp
+++ b/alc/backends/sndio.cpp
@@ -35,6 +35,7 @@
 #include "threads.h"
 #include "vector.h"
 #include "ringbuffer.h"
+#include "logging.h"
 
 #include <sndio.h>
 
diff --git a/alc/backends/solaris.cpp b/alc/backends/solaris.cpp
index 78f5f142..6f058a16 100644
--- a/alc/backends/solaris.cpp
+++ b/alc/backends/solaris.cpp
@@ -42,9 +42,10 @@
 #include "alexcpt.h"
 #include "alu.h"
 #include "alconfig.h"
+#include "compat.h"
+#include "logging.h"
 #include "threads.h"
 #include "vector.h"
-#include "compat.h"
 
 #include <sys/audioio.h>
 
diff --git a/alc/backends/wasapi.cpp b/alc/backends/wasapi.cpp
index 462b5038..cf2b7e17 100644
--- a/alc/backends/wasapi.cpp
+++ b/alc/backends/wasapi.cpp
@@ -58,9 +58,10 @@
 #include "alcmain.h"
 #include "alexcpt.h"
 #include "alu.h"
-#include "ringbuffer.h"
 #include "compat.h"
 #include "converter.h"
+#include "logging.h"
+#include "ringbuffer.h"
 #include "strutils.h"
 #include "threads.h"
 
diff --git a/alc/backends/winmm.cpp b/alc/backends/winmm.cpp
index d85b611d..ec382522 100644
--- a/alc/backends/winmm.cpp
+++ b/alc/backends/winmm.cpp
@@ -40,10 +40,11 @@
 #include "alcmain.h"
 #include "alexcpt.h"
 #include "alu.h"
+#include "compat.h"
+#include "logging.h"
 #include "ringbuffer.h"
 #include "strutils.h"
 #include "threads.h"
-#include "compat.h"
 
 #ifndef WAVE_FORMAT_IEEE_FLOAT
 #define WAVE_FORMAT_IEEE_FLOAT  0x0003
diff --git a/alc/logging.h b/alc/logging.h
index ec6023a5..1077f08f 100644
--- a/alc/logging.h
+++ b/alc/logging.h
@@ -6,16 +6,9 @@
 #include "opthelpers.h"
 
 
-#ifdef __GNUC__
-#define DECL_FORMAT(x, y, z) __attribute__((format(x, (y), (z))))
-#else
-#define DECL_FORMAT(x, y, z)
-#endif
-
-
 extern FILE *gLogFile;
 
-void al_print(FILE *logfile, const char *fmt, ...) DECL_FORMAT(printf, 2,3);
+[[gnu::format(printf,2,3)]] void al_print(FILE *logfile, const char *fmt, ...);
 #if !defined(_WIN32)
 #define AL_PRINT fprintf
 #else