diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2016-10-24 08:58:22 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2016-10-24 08:58:22 +1000 |
| commit | 29e7ec5a3d7e920950d5a5c97020ce82b30c4888 (patch) | |
| tree | 6d49f807b57024af1fab7da398351b088f3c57a2 | |
| parent | 2865729adc2f004b61ba853d98a4c2758fd0b601 (diff) | |
Switch to using "#if HAVE_XI..." exclusively
Don't mix "if" and "ifdef"
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | src/list.c | 6 | ||||
| -rw-r--r-- | src/property.c | 6 | ||||
| -rw-r--r-- | src/test_xi2.c | 4 | ||||
| -rw-r--r-- | src/xinput.c | 2 | ||||
| -rw-r--r-- | src/xinput.h | 2 |
5 files changed, 10 insertions, 10 deletions
@@ -138,7 +138,7 @@ static int list_xi1(Display *display, return EXIT_SUCCESS; } -#ifdef HAVE_XI2 +#if HAVE_XI2 /* 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; -#ifdef HAVE_XI2 +#if HAVE_XI2 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; -#ifdef HAVE_XI2 +#if HAVE_XI2 if (xinput_version(display) == XI_2_Major) return list_xi2(display, format); #endif diff --git a/src/property.c b/src/property.c index 0f073df..e4a46f8 100644 --- 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) { -#ifdef HAVE_XI2 +#if HAVE_XI2 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) { -#ifdef HAVE_XI2 +#if HAVE_XI2 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) { -#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 diff --git a/src/test_xi2.c b/src/test_xi2.c index 11ec08f..402acac 100644 --- 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); -#ifdef HAVE_XI22 +#if HAVE_XI22 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); -#ifdef HAVE_XI22 +#if HAVE_XI22 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 b0e0e7f..5dd2766 100644 --- a/src/xinput.c +++ b/src/xinput.c @@ -273,7 +273,7 @@ find_device_info(Display *display, return found; } -#ifdef HAVE_XI2 +#if HAVE_XI2 Bool is_pointer(int use) { return use == XIMasterPointer || use == XISlavePointer; diff --git a/src/xinput.h b/src/xinput.h index c37e6e6..ce2cfa1 100644 --- a/src/xinput.h +++ b/src/xinput.h @@ -27,7 +27,7 @@ #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> |