summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stone <daniel@fooishbar.org>2005-07-03 12:15:16 +0000
committerDaniel Stone <daniel@fooishbar.org>2005-07-03 12:15:16 +0000
commitc1e69798ad14fb706f5f6de67e3f53df56f524c6 (patch)
treef9cf6c40e53756633a1a549d886eb79aabbaa7b1
parent4e501d35e260775a43f340b3e1a9aa092570aba4 (diff)
Add explicit PSZ defines, remove unnecessary dix-config.h include.XORG-6_8_99_14
Add -DXF86PM, forgotten from last commit.
-rw-r--r--hw/xfree86/dixmods/cfb16module.c4
-rw-r--r--hw/xfree86/dixmods/cfb24module.c4
-rw-r--r--hw/xfree86/dixmods/cfb32module.c4
-rw-r--r--hw/xfree86/dixmods/cfbmodule.c4
4 files changed, 4 insertions, 12 deletions
diff --git a/hw/xfree86/dixmods/cfb16module.c b/hw/xfree86/dixmods/cfb16module.c
index 7dcf52625..f5ad48f4d 100644
--- a/hw/xfree86/dixmods/cfb16module.c
+++ b/hw/xfree86/dixmods/cfb16module.c
@@ -29,9 +29,7 @@
#include <xorg-config.h>
#endif
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
+#define PSZ 16
#ifdef XFree86LOADER
diff --git a/hw/xfree86/dixmods/cfb24module.c b/hw/xfree86/dixmods/cfb24module.c
index c467db703..c2fb2bcf5 100644
--- a/hw/xfree86/dixmods/cfb24module.c
+++ b/hw/xfree86/dixmods/cfb24module.c
@@ -29,9 +29,7 @@
#include <xorg-config.h>
#endif
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
+#define PSZ 24
#ifdef XFree86LOADER
diff --git a/hw/xfree86/dixmods/cfb32module.c b/hw/xfree86/dixmods/cfb32module.c
index 619586320..0ead3ef93 100644
--- a/hw/xfree86/dixmods/cfb32module.c
+++ b/hw/xfree86/dixmods/cfb32module.c
@@ -29,9 +29,7 @@
#include <xorg-config.h>
#endif
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
+#define PSZ 32
#ifdef XFree86LOADER
diff --git a/hw/xfree86/dixmods/cfbmodule.c b/hw/xfree86/dixmods/cfbmodule.c
index f2cd87e59..095bc8416 100644
--- a/hw/xfree86/dixmods/cfbmodule.c
+++ b/hw/xfree86/dixmods/cfbmodule.c
@@ -29,9 +29,7 @@
#include <xorg-config.h>
#endif
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
+#define PSZ 8
#ifdef XFree86LOADER