build: renable -Wstrict-prototypes compiler warning

The warning -Wstrict-prototypes was disabled by commit
db9b1df0e47996ff8aaea468a11e1e97f64ee126 .

Enable it again, but avoid warnings for WiMax SDK by explicitly disabling the
compiler warning where needed.

Apparently clang does not produce a warning for -Wstrict-prototypes,
hence we don't need a clang specific #pragma.

Signed-off-by: Thomas Haller <thaller@redhat.com>

diff --git a/m4/compiler_warnings.m4 b/m4/compiler_warnings.m4
index 79d2cbf..3fde795 100644 (file)
--- a/m4/compiler_warnings.m4
+++ b/m4/compiler_warnings.m4
@@ -25,6 +25,7 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
        for option in -Wshadow -Wmissing-declarations -Wmissing-prototypes \
                      -Wdeclaration-after-statement -Wformat-security \
                      -Wfloat-equal -Wno-unused-parameter -Wno-sign-compare \
+                     -Wstrict-prototypes \
                      -fno-strict-aliasing -Wno-unused-but-set-variable \
                      -Wundef -Wimplicit-function-declaration \
                      -Wpointer-arith -Winit-self \

diff --git a/src/devices/wimax/iwmxsdk.c b/src/devices/wimax/iwmxsdk.c
index e6b54d8..2508088 100644 (file)
--- a/src/devices/wimax/iwmxsdk.c
+++ b/src/devices/wimax/iwmxsdk.c
@@ -31,7 +31,8 @@
 
 #include <glib.h>
 
-#include <WiMaxType.h>
+#include "nm-wimax-util.h"
+
 #include <WiMaxAPI.h>
 #include <WiMaxAPIEx.h>
 

diff --git a/src/devices/wimax/iwmxsdk.h b/src/devices/wimax/iwmxsdk.h
index 9a1b819..c8e7669 100644 (file)
--- a/src/devices/wimax/iwmxsdk.h
+++ b/src/devices/wimax/iwmxsdk.h
@@ -22,7 +22,8 @@
 #ifndef __IWMXSDK_H__
 #define __IWMXSDK_H__
 
-#include <wimax/WiMaxType.h>
+#include "nm-wimax-util.h"
+
 #include <wimax/WiMaxTypesEx.h>
 #include <wimax/WiMaxAPIEx.h>
 

diff --git a/src/devices/wimax/nm-device-wimax.c b/src/devices/wimax/nm-device-wimax.c
index ec892b6..34c2d2a 100644 (file)
--- a/src/devices/wimax/nm-device-wimax.c
+++ b/src/devices/wimax/nm-device-wimax.c
@@ -26,6 +26,9 @@
 #include <sys/socket.h>
 
 #include <glib/gi18n.h>
+
+#include "nm-wimax-util.h"
+
 #include <WiMaxAPI.h>
 #include <WiMaxAPIEx.h>
 

diff --git a/src/devices/wimax/nm-wimax-util.c b/src/devices/wimax/nm-wimax-util.c
index bca25a1..3c90eba 100644 (file)
--- a/src/devices/wimax/nm-wimax-util.c
+++ b/src/devices/wimax/nm-wimax-util.c
@@ -18,7 +18,6 @@
  * Copyright (C) 2009 Novell, Inc.
  */
 
-#include <WiMaxAPI.h>
 #include "nm-wimax-util.h"
 #include "nm-utils.h"
 #include "iwmxsdk.h"

diff --git a/src/devices/wimax/nm-wimax-util.h b/src/devices/wimax/nm-wimax-util.h
index d5ec0f0..3652123 100644 (file)
--- a/src/devices/wimax/nm-wimax-util.h
+++ b/src/devices/wimax/nm-wimax-util.h
@@ -23,7 +23,13 @@
 
 #include <glib.h>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wstrict-prototypes"
+
 #include <WiMaxType.h>
+
+#pragma GCC diagnostic pop
+
 #include <WiMaxError.h>
 #include "nm-wimax-types.h"