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>
master
Peter Hutterer 16 years ago
parent 539d67505c
commit 35b6085bf8
  1. 1
      configure.ac
  2. 2
      src/draglock.c
  3. 3
      src/emuMB.c
  4. 2
      src/emuWheel.c
  5. 4
      src/evdev.c
  6. 1
      src/evdev.h

@ -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

@ -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. */

@ -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,

@ -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

@ -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>

@ -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>

Loading…
Cancel
Save