X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fmodules-load%2Fmodules-load.c;h=37d7a77068c6d81628652b71e9a349f5ceed4ec1;hp=c3aa4094467abcf37c8996015f8864dc580516b5;hb=bcfce235a3d757f0ec3b0c01e8583382db1adfe2;hpb=beb999379ced9e8d765e533e43d35aab11aa5c39

diff --git a/src/modules-load/modules-load.c b/src/modules-load/modules-load.c
index c3aa40944..37d7a7706 100644
--- a/src/modules-load/modules-load.c
+++ b/src/modules-load/modules-load.c
@@ -48,13 +48,13 @@ static const char conf_file_dirs[] =
 #endif
         ;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wformat-nonliteral"
 static void systemd_kmod_log(void *data, int priority, const char *file, int line,
                              const char *fn, const char *format, va_list args) {
+
+        DISABLE_WARNING_FORMAT_NONLITERAL;
         log_metav(priority, file, line, fn, format, args);
+        REENABLE_WARNING;
 }
-#pragma GCC diagnostic pop
 
 static int add_modules(const char *p) {
         _cleanup_strv_free_ char **k = NULL;