summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--glx/glapi.c7
-rwxr-xr-xhw/xfree86/loader/sdksyms.sh1
2 files changed, 7 insertions, 1 deletions
diff --git a/glx/glapi.c b/glx/glapi.c
index fa3808e4d..d6a568e88 100644
--- a/glx/glapi.c
+++ b/glx/glapi.c
@@ -114,10 +114,15 @@ warn(void)
}
}
+#if defined(__GNUC__) && (__GNUC__ > 2)
+#define possibly_unused __attribute((unused))
+#else
+#define possibly_unused
+#endif
#define KEYWORD1 static
#define KEYWORD1_ALT static
-#define KEYWORD2 GLAPIENTRY
+#define KEYWORD2 GLAPIENTRY possibly_unused
#define NAME(func) NoOp##func
#define F NULL
diff --git a/hw/xfree86/loader/sdksyms.sh b/hw/xfree86/loader/sdksyms.sh
index 11865472f..eea024063 100755
--- a/hw/xfree86/loader/sdksyms.sh
+++ b/hw/xfree86/loader/sdksyms.sh
@@ -2,6 +2,7 @@
cat > sdksyms.c << EOF
/* This file is automatically generated by sdksyms.sh. */
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>