[PATCH aiptek 13/18] unifdef XFree86LOADER

Peter Hutterer peter.hutterer at who-t.net
Wed Dec 1 18:13:44 PST 2010


Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 src/xf86Aiptek.c |    3 ---
 src/xf86Aiptek.h |    9 +--------
 2 files changed, 1 insertions(+), 11 deletions(-)

diff --git a/src/xf86Aiptek.c b/src/xf86Aiptek.c
index e433c3b..ba02444 100644
--- a/src/xf86Aiptek.c
+++ b/src/xf86Aiptek.c
@@ -2433,7 +2433,6 @@ SetupProc_fail:
  *
  ***************************************************************************
  */
-#ifdef XFree86LOADER
 /*
  * xf86AiptekUnplug --
  *
@@ -2486,6 +2485,4 @@ _X_EXPORT XF86ModuleData aiptekModuleData =
     xf86AiptekUnplug
 };
 
-#endif /* XFree86LOADER */
-
 /* end of xf86Aiptek.c */
diff --git a/src/xf86Aiptek.h b/src/xf86Aiptek.h
index 69b75bb..91db608 100644
--- a/src/xf86Aiptek.h
+++ b/src/xf86Aiptek.h
@@ -60,11 +60,6 @@
 #include <xorg-server.h>
 #include <xorgVersion.h>
 
-#ifndef XFree86LOADER
-#   include <unistd.h>
-#   include <errno.h>
-#endif
-
 #include <misc.h>
 #include <xf86.h>
 
@@ -78,9 +73,7 @@
 #include <X11/keysym.h>
 #include <mipointer.h>
 
-#ifdef XFree86LOADER
-#   include <xf86Module.h>
-#endif
+#include <xf86Module.h>
 
 #define CURSOR_SECTION_NAME "AiptekCursor"
 #define STYLUS_SECTION_NAME "AiptekStylus"
-- 
1.7.3.2



More information about the xorg-devel mailing list