diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2005-07-03 07:02:09 +0000 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2005-07-03 07:02:09 +0000 |
| commit | e03198972ca78b03ad13cb49112c03a052bb763b (patch) | |
| tree | 1278f4b1a41b11511b0f5c2932191e44f0f9d8d3 /hw/xfree86/vgahw | |
| parent | b8aef6c474ffc6d637bec178674898ea95ccde47 (diff) | |
Add Xtrans definitions (FONT_t, TRANS_CLIENT) to clean up warnings.
Add XSERV_t, TRANS_SERVER, TRANS_REOPEN to quash warnings.
Add #include <dix-config.h> or <xorg-config.h>, as appropriate, to all
source files in the xserver/xorg tree, predicated on defines of
HAVE_{DIX,XORG}_CONFIG_H. Change all Xfont includes to
<X11/fonts/foo.h>.
Diffstat (limited to 'hw/xfree86/vgahw')
| -rw-r--r-- | hw/xfree86/vgahw/vgaCmap.c | 4 | ||||
| -rw-r--r-- | hw/xfree86/vgahw/vgaHW.c | 4 | ||||
| -rw-r--r-- | hw/xfree86/vgahw/vgaHW.h | 4 | ||||
| -rw-r--r-- | hw/xfree86/vgahw/vgaHWmodule.c | 4 |
4 files changed, 16 insertions, 0 deletions
diff --git a/hw/xfree86/vgahw/vgaCmap.c b/hw/xfree86/vgahw/vgaCmap.c index d73c04300..85f8bbdb8 100644 --- a/hw/xfree86/vgahw/vgaCmap.c +++ b/hw/xfree86/vgahw/vgaCmap.c @@ -24,6 +24,10 @@ /* $XConsortium: vgaCmap.c /main/15 1996/10/28 05:13:44 kaleb $ */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/Xproto.h> #include "windowstr.h" diff --git a/hw/xfree86/vgahw/vgaHW.c b/hw/xfree86/vgahw/vgaHW.c index fb0e65b7e..07a41d128 100644 --- a/hw/xfree86/vgahw/vgaHW.c +++ b/hw/xfree86/vgahw/vgaHW.c @@ -12,6 +12,10 @@ #define _NEED_SYSI86 +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #include <X11/X.h> #include <X11/misc.h> diff --git a/hw/xfree86/vgahw/vgaHW.h b/hw/xfree86/vgahw/vgaHW.h index 14dbb4be3..568d45093 100644 --- a/hw/xfree86/vgahw/vgaHW.h +++ b/hw/xfree86/vgahw/vgaHW.h @@ -11,6 +11,10 @@ * Author: Dirk Hohndel */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifndef _VGAHW_H #define _VGAHW_H diff --git a/hw/xfree86/vgahw/vgaHWmodule.c b/hw/xfree86/vgahw/vgaHWmodule.c index d6044bbb7..9f5a5a9c2 100644 --- a/hw/xfree86/vgahw/vgaHWmodule.c +++ b/hw/xfree86/vgahw/vgaHWmodule.c @@ -4,6 +4,10 @@ * Copyright 1998 by The XFree86 Project, Inc */ +#ifdef HAVE_XORG_CONFIG_H +#include <xorg-config.h> +#endif + #ifdef XFree86LOADER #include "xf86Module.h" |