From c1e69798ad14fb706f5f6de67e3f53df56f524c6 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Sun, 3 Jul 2005 12:15:16 +0000 Subject: Add explicit PSZ defines, remove unnecessary dix-config.h include. Add -DXF86PM, forgotten from last commit. --- hw/xfree86/dixmods/cfb16module.c | 4 +--- hw/xfree86/dixmods/cfb24module.c | 4 +--- hw/xfree86/dixmods/cfb32module.c | 4 +--- hw/xfree86/dixmods/cfbmodule.c | 4 +--- 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 #endif -#ifdef HAVE_DIX_CONFIG_H -#include -#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 #endif -#ifdef HAVE_DIX_CONFIG_H -#include -#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 #endif -#ifdef HAVE_DIX_CONFIG_H -#include -#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 #endif -#ifdef HAVE_DIX_CONFIG_H -#include -#endif +#define PSZ 8 #ifdef XFree86LOADER -- cgit v1.2.3