summaryrefslogtreecommitdiff
path: root/src/core/errors.c
diff options
context:
space:
mode:
authorScott Balneaves <[email protected]>2012-11-20 22:50:33 -0600
committerScott Balneaves <[email protected]>2012-11-20 22:50:33 -0600
commit3c82397d3fdbbaa8d1614a6f5eeeaad4ef20d3f6 (patch)
tree620d5fa2f8be7c9a65313c6a238cc349e6faaad4 /src/core/errors.c
parentd72b5f2a0bbd035a98979c3519de90a194f67e05 (diff)
downloadmarco-3c82397d3fdbbaa8d1614a6f5eeeaad4ef20d3f6.tar.bz2
marco-3c82397d3fdbbaa8d1614a6f5eeeaad4ef20d3f6.tar.xz
Fix deprecations and compile warnings. Clean compile
Diffstat (limited to 'src/core/errors.c')
-rw-r--r--src/core/errors.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/core/errors.c b/src/core/errors.c
index 6539d7b1..c603ccfd 100644
--- a/src/core/errors.c
+++ b/src/core/errors.c
@@ -29,6 +29,12 @@
#include <stdlib.h>
#include <gdk/gdk.h>
+#ifdef __GNUC__
+#define UNUSED_VARIABLE __attribute__ ((unused))
+#else
+#define UNUSED_VARIABLE
+#endif
+
static int x_error_handler (Display *display,
XErrorEvent *error);
static int x_io_error_handler (Display *display);
@@ -121,7 +127,7 @@ meta_error_trap_pop_internal (MetaDisplay *display,
* assumes that there are no pending GDK traps from GDK itself
*/
- int (* restored_error_handler) (Display *,
+ int UNUSED_VARIABLE (* restored_error_handler) (Display *,
XErrorEvent *);
restored_error_handler = XSetErrorHandler (x_error_handler);