Switch to using "#if HAVE_XI..." exclusively

Don't mix  "if" and "ifdef"

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

diff --git a/src/list.c b/src/list.c
index 3fa123bdb37a8646e2990d647e5a70274ec28a7a..38bc777f5d98e31eda1903cbd37ad8f259b7c6a6 100644 (file)
--- a/src/list.c
+++ b/src/list.c
@@ -138,7 +138,7 @@ static int list_xi1(Display     *display,
     return EXIT_SUCCESS;
 }
 
     return EXIT_SUCCESS;
 }
 

-#ifdef HAVE_XI2
+#if HAVE_XI2

 /* also used from test_xi2.c */
 void
 print_classes_xi2(Display* display, XIAnyClassInfo **classes,
 /* also used from test_xi2.c */
 void
 print_classes_xi2(Display* display, XIAnyClassInfo **classes,


@@ -371,7 +371,7 @@ list(Display        *display,
     {
         if (format == FORMAT_NONE)
             format = FORMAT_LONG;
     {
         if (format == FORMAT_NONE)
             format = FORMAT_LONG;

-#ifdef HAVE_XI2
+#if HAVE_XI2

         if (xinput_version(display) == XI_2_Major)
         {
             XIDeviceInfo *info = xi2_find_device_info(display, argv[arg_dev]);
         if (xinput_version(display) == XI_2_Major)
         {
             XIDeviceInfo *info = xi2_find_device_info(display, argv[arg_dev]);


@@ -399,7 +399,7 @@ list(Display        *display,
     } else {
         if (format == FORMAT_NONE)
             format = FORMAT_SHORT;
     } else {
         if (format == FORMAT_NONE)
             format = FORMAT_SHORT;

-#ifdef HAVE_XI2
+#if HAVE_XI2

         if (xinput_version(display) == XI_2_Major)
             return list_xi2(display, format);
 #endif
         if (xinput_version(display) == XI_2_Major)
             return list_xi2(display, format);
 #endif

diff --git a/src/property.c b/src/property.c
index 0f073dfc9c958dc2b659689f913285fdf9c83b5e..e4a46f814fcf4f77b86b4fca8c2cb28ae0acac95 100644 (file)
--- a/src/property.c
+++ b/src/property.c
@@ -714,7 +714,7 @@ do_set_prop_xi2(Display *dpy, Atom type, int format, int argc, char **argv, char
 int list_props(Display *display, int argc, char *argv[], char *name,
                char *desc)
 {
 int list_props(Display *display, int argc, char *argv[], char *name,
                char *desc)
 {

-#ifdef HAVE_XI2
+#if HAVE_XI2

     if (xinput_version(display) == XI_2_Major)
         return list_props_xi2(display, argc, argv, name, desc);
 #endif
     if (xinput_version(display) == XI_2_Major)
         return list_props_xi2(display, argc, argv, name, desc);
 #endif


@@ -725,7 +725,7 @@ int list_props(Display *display, int argc, char *argv[], char *name,
 int delete_prop(Display *display, int argc, char *argv[], char *name,
                 char *desc)
 {
 int delete_prop(Display *display, int argc, char *argv[], char *name,
                 char *desc)
 {

-#ifdef HAVE_XI2
+#if HAVE_XI2

     if (xinput_version(display) == XI_2_Major)
         return delete_prop_xi2(display, argc, argv, name, desc);
 #endif
     if (xinput_version(display) == XI_2_Major)
         return delete_prop_xi2(display, argc, argv, name, desc);
 #endif


@@ -736,7 +736,7 @@ int delete_prop(Display *display, int argc, char *argv[], char *name,
 static int
 do_set_prop(Display *display, Atom type, int format, int argc, char *argv[], char *name, char *desc)
 {
 static int
 do_set_prop(Display *display, Atom type, int format, int argc, char *argv[], char *name, char *desc)
 {

-#ifdef HAVE_XI2
+#if HAVE_XI2

     if (xinput_version(display) == XI_2_Major)
         return do_set_prop_xi2(display, type, format, argc, argv, name, desc);
 #endif
     if (xinput_version(display) == XI_2_Major)
         return do_set_prop_xi2(display, type, format, argc, argv, name, desc);
 #endif

diff --git a/src/test_xi2.c b/src/test_xi2.c
index 11ec08f96edba7e63bc1fae939515ea758e968ad..402acacf36b7eb11a8d6db96c4dbab59fd24de56 100644 (file)
--- a/src/test_xi2.c
+++ b/src/test_xi2.c
@@ -376,7 +376,7 @@ test_xi2(Display    *display,
     XISetMask(m->mask, XI_Leave);
     XISetMask(m->mask, XI_FocusIn);
     XISetMask(m->mask, XI_FocusOut);
     XISetMask(m->mask, XI_Leave);
     XISetMask(m->mask, XI_FocusIn);
     XISetMask(m->mask, XI_FocusOut);

-#ifdef HAVE_XI22
+#if HAVE_XI22

     XISetMask(m->mask, XI_TouchBegin);
     XISetMask(m->mask, XI_TouchUpdate);
     XISetMask(m->mask, XI_TouchEnd);
     XISetMask(m->mask, XI_TouchBegin);
     XISetMask(m->mask, XI_TouchUpdate);
     XISetMask(m->mask, XI_TouchEnd);


@@ -394,7 +394,7 @@ test_xi2(Display    *display,
     XISetMask(m->mask, XI_RawButtonPress);
     XISetMask(m->mask, XI_RawButtonRelease);
     XISetMask(m->mask, XI_RawMotion);
     XISetMask(m->mask, XI_RawButtonPress);
     XISetMask(m->mask, XI_RawButtonRelease);
     XISetMask(m->mask, XI_RawMotion);

-#ifdef HAVE_XI22
+#if HAVE_XI22

     XISetMask(m->mask, XI_RawTouchBegin);
     XISetMask(m->mask, XI_RawTouchUpdate);
     XISetMask(m->mask, XI_RawTouchEnd);
     XISetMask(m->mask, XI_RawTouchBegin);
     XISetMask(m->mask, XI_RawTouchUpdate);
     XISetMask(m->mask, XI_RawTouchEnd);

diff --git a/src/xinput.c b/src/xinput.c
index b0e0e7f7585ca97f769dc749facafe61a1ec98a6..5dd276608dec8b212c9d538cc7260807dbbc5342 100644 (file)
--- a/src/xinput.c
+++ b/src/xinput.c
@@ -273,7 +273,7 @@ find_device_info(Display    *display,
     return found;
 }
 
     return found;
 }
 

-#ifdef HAVE_XI2
+#if HAVE_XI2

 Bool is_pointer(int use)
 {
     return use == XIMasterPointer || use == XISlavePointer;
 Bool is_pointer(int use)
 {
     return use == XIMasterPointer || use == XISlavePointer;

diff --git a/src/xinput.h b/src/xinput.h
index c37e6e62551e1fdcd1b6c2bb298fb1d540ecf753..ce2cfa129dbe26530dd3896731fb019a7c2e524b 100644 (file)
--- a/src/xinput.h
+++ b/src/xinput.h
@@ -27,7 +27,7 @@
 
 #include <X11/Xlib.h>
 #include <X11/extensions/XInput.h>
 
 #include <X11/Xlib.h>
 #include <X11/extensions/XInput.h>

-#ifdef HAVE_XI2
+#if HAVE_XI2

 #include <X11/extensions/XInput2.h>
 #endif
 #include <X11/Xutil.h>
 #include <X11/extensions/XInput2.h>
 #endif
 #include <X11/Xutil.h>