[at-spi2-core] Revert "Block out X11 API with #ifdefs"

[Mike Gorse <mgorse src gnome org>]

commit e6ec6dfdf97a4d13594e3e45ae4462feaa46d94e
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Fri Nov 18 10:57:42 2016 +0000

    Revert "Block out X11 API with #ifdefs"
    
    This reverts commit 27e7b242d65a78d40d68f20ac375929914c3b7a8.
    
    The build breaks with X11 support enabled.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=773710

 registryd/deviceeventcontroller.c |    4 ++--
 registryd/display.h               |    2 --
 registryd/event-source.h          |    4 +---
 registryd/ucs2keysym.c            |    1 +
 4 files changed, 4 insertions(+), 7 deletions(-)
---
diff --git a/registryd/deviceeventcontroller.c b/registryd/deviceeventcontroller.c
index fabab78..8fefbd7 100644
--- a/registryd/deviceeventcontroller.c
+++ b/registryd/deviceeventcontroller.c
@@ -634,7 +634,7 @@ handle_keygrab (SpiDEController         *controller,
   grab_mask.mod_mask = key_listener->mask;
   if (g_slist_length (key_listener->keys) == 0) /* special case means AnyKey/AllKeys */
     {
-      grab_mask.key_val = 0L;  /* AnyKey */
+      grab_mask.key_val = AnyKey;
 #ifdef SPI_DEBUG
       fprintf (stderr, "AnyKey grab!");
 #endif
@@ -1751,7 +1751,7 @@ impl_generate_keyboard_event (DBusConnection *bus, DBusMessage *message, void *u
               * in our arg list; it can contain either
               * a keycode or a keysym.
               */
-             spi_dec_synth_keysym (controller, keycode);
+             spi_dec_synth_keysym (controller, (KeySym) keycode);
              break;
       case Accessibility_KEY_STRING:
              if (!spi_dec_plat_synth_keystring (controller, synth_type, keycode, keystring))
diff --git a/registryd/display.h b/registryd/display.h
index 5aa4470..2238a55 100644
--- a/registryd/display.h
+++ b/registryd/display.h
@@ -23,14 +23,12 @@
 #ifndef SPI_DISPLAY_H_
 #define SPI_DISPLAY_H_
 
-#if HAVE_X11
 #include <X11/Xlib.h>
 
 Display *spi_set_display (const char *display_name);
 Display *spi_get_display ();
 
 Window spi_get_root_window ();
-#endif /* HAVE_X11 */
 
 void spi_x_error_trap (void);
 int spi_x_error_release (void);
diff --git a/registryd/event-source.h b/registryd/event-source.h
index a8bbefe..55ab663 100644
--- a/registryd/event-source.h
+++ b/registryd/event-source.h
@@ -23,13 +23,11 @@
 #ifndef SPI_EVENT_SOURCE_H_
 #define SPI_EVENT_SOURCE_H_
 
-#ifdef HAVE_X11
 #include <X11/Xlib.h>
 
 void spi_events_init (Display *display);
-void spi_set_filter (void (*filter) (XEvent*, void*), void* data);
-#endif /* HAVE_X11 */
 void spi_events_uninit ();
 void spi_set_events (long event_mask);
+void spi_set_filter (void (*filter) (XEvent*, void*), void* data);
 
 #endif /* SPI_EVENT_SOURCE_H_ */
diff --git a/registryd/ucs2keysym.c b/registryd/ucs2keysym.c
index 2d0a512..b4967be 100644
--- a/registryd/ucs2keysym.c
+++ b/registryd/ucs2keysym.c
@@ -31,6 +31,7 @@
  *
  */
 
+#include <X11/X.h>
 #include "deviceeventcontroller.h"     /* for prototype */
 
 struct codepair {