diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2010-04-28 10:41:06 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2010-04-29 09:07:03 +1000 |
| commit | 35b6085bf8feb9e6d3d3020db868a6e285dec38a (patch) | |
| tree | ca534c34a8d5475ff037eaa749c31173a2cd036f | |
| parent | Revert "config: remove AH_TOP autoheader statement" (diff) | |
| download | xf86-input-evdev-35b6085bf8feb9e6d3d3020db868a6e285dec38a.tar.gz xf86-input-evdev-35b6085bf8feb9e6d3d3020db868a6e285dec38a.tar.bz2 xf86-input-evdev-35b6085bf8feb9e6d3d3020db868a6e285dec38a.zip | |
config: remove AH_TOP autoheader statement.
Include it in evdev.h instead.
xorg-server.h is required to define the right datatype sizes on 64 bit,
hence ensure that evdev.h is the first included in each file.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/draglock.c | 2 | ||||
| -rw-r--r-- | src/emuMB.c | 3 | ||||
| -rw-r--r-- | src/emuWheel.c | 2 | ||||
| -rw-r--r-- | src/evdev.c | 4 | ||||
| -rw-r--r-- | src/evdev.h | 1 |
6 files changed, 7 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 35c9ce8..da46c68 100644 --- a/configure.ac +++ b/configure.ac @@ -33,7 +33,6 @@ AC_CONFIG_AUX_DIR(.) # Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -AH_TOP([#include "xorg-server.h"]) # Initialize libtool AC_DISABLE_STATIC diff --git a/src/draglock.c b/src/draglock.c index a7ad974..fad4436 100644 --- a/src/draglock.c +++ b/src/draglock.c @@ -35,6 +35,7 @@ #ifdef HAVE_CONFIG_H #include "config.h" #endif +#include "evdev.h" #include <xf86.h> #include <xf86Xinput.h> @@ -42,7 +43,6 @@ #include <exevents.h> #include <evdev-properties.h> -#include "evdev.h" #ifdef HAVE_PROPERTIES static Atom prop_dlock = 0; /* Drag lock buttons. */ diff --git a/src/emuMB.c b/src/emuMB.c index 113a708..c33ea8e 100644 --- a/src/emuMB.c +++ b/src/emuMB.c @@ -34,13 +34,14 @@ #include "config.h" #endif +#include "evdev.h" + #include <X11/Xatom.h> #include <xf86.h> #include <xf86Xinput.h> #include <exevents.h> #include <evdev-properties.h> -#include "evdev.h" enum { MBEMU_DISABLED = 0, diff --git a/src/emuWheel.c b/src/emuWheel.c index afafff7..35e6931 100644 --- a/src/emuWheel.c +++ b/src/emuWheel.c @@ -33,6 +33,7 @@ #ifdef HAVE_CONFIG_H #include "config.h" #endif +#include "evdev.h" #include <X11/Xatom.h> #include <xf86.h> @@ -40,7 +41,6 @@ #include <exevents.h> #include <evdev-properties.h> -#include "evdev.h" #define WHEEL_NOT_CONFIGURED 0 diff --git a/src/evdev.c b/src/evdev.c index ccea90d..205d6c6 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -31,6 +31,8 @@ #include "config.h" #endif +#include "evdev.h" + #include <X11/keysym.h> #include <X11/extensions/XI.h> @@ -45,8 +47,6 @@ #include <xorgVersion.h> #include <xkbsrv.h> -#include "evdev.h" - #ifdef HAVE_PROPERTIES #include <X11/Xatom.h> #include <evdev-properties.h> diff --git a/src/evdev.h b/src/evdev.h index 1133985..8c89f83 100644 --- a/src/evdev.h +++ b/src/evdev.h @@ -34,6 +34,7 @@ #include <linux/input.h> #include <linux/types.h> +#include <xorg-server.h> #include <xf86Xinput.h> #include <xf86_OSproc.h> #include <xkbstr.h> |