Silence warnings about usage of deprecated function when existing alternative is...
authorNelson Ferreira <nelson.ferreira@ieee.org>
Sun, 6 Dec 2015 22:24:36 +0000 (17:24 -0500)
committerNelson Ferreira <nelson.ferreira@ieee.org>
Sun, 6 Dec 2015 22:24:36 +0000 (17:24 -0500)
* src/ui/X11/event-Xt.c (whatever): Add pragma to ignore warning.

Signed-off-by: Nelson Ferreira <nelson.ferreira@ieee.org>
src/ui/X11/event-Xt.c

index ae10350..486046e 100644 (file)
@@ -600,13 +600,18 @@ whatever(Display *dspl, struct x_device *xd, struct mod_clo_s *clo)
                [modifier_index * mkpm + modifier_key];
 
        for (int column = 0; column < 4; column += 2) {
-               KeySym sym = code
 #ifdef HAVE_XKBKEYCODETOKEYSYM
-                       ? XkbKeycodeToKeysym(dspl, code, 0, column)
+                KeySym sym = code
+                        ? XkbKeycodeToKeysym(dspl, code, 0, column)
+                        : 0;
 #else
-                       ? XKeycodeToKeysym(dspl, code, column)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+                KeySym sym = code
+                        ? XKeycodeToKeysym(dspl, code, column)
+                        : 0;
+#pragma GCC diagnostic pop
 #endif
-                       : 0;
 
                if (LIKELY(sym == last_sym)) {
                        continue;