From a407fa373bb72f29050e3f027042011075b3bdf0 Mon Sep 17 00:00:00 2001 From: Kevin E Martin Date: Fri, 15 Jul 2005 22:51:05 +0000 Subject: Move drm up to os-support since the files are shared by multiple platforms. Fix the dri and drm build. Fix server-side DMX extension build. Make xf4bpp use the correct version of mfbline.c for mfbseg.c. Add #ifndef _HEADERNAME_H_/#define _HEADERNAME_H_/.../#endif to the headers. --- include/xorg-config.h.in | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'include/xorg-config.h.in') diff --git a/include/xorg-config.h.in b/include/xorg-config.h.in index f4c25f13a..ebc3d12c8 100644 --- a/include/xorg-config.h.in +++ b/include/xorg-config.h.in @@ -1,14 +1,14 @@ -/* - * xorg-config.h.in: not at all generated. +/* xorg-config.h.in: not at all generated. -*- c -*- * - * This file differs from xorg-server.h.in in that -server is installed with the - * rest of the SDK for external drivers/modules to use, whereas -config is for - * internal use only (i.e. building the DDX). + * This file differs from xorg-server.h.in in that -server is installed + * with the rest of the SDK for external drivers/modules to use, whereas + * -config is for internal use only (i.e. building the DDX). * */ -/* Normally these are guarded, but if we don't have dix-config.h, we're in some - * pretty serious trouble anyway. Consider this a canary. */ +#ifndef _XORG_CONFIG_H_ +#define _XORG_CONFIG_H_ + #include #include @@ -61,11 +61,9 @@ #undef DEFAULT_LOGPREFIX /* Building DRI-capable DDX. */ -#undef XORGDRI - -/* Building DRI-capable DDX. */ -#undef _XORGDRI_SERVER_ +#undef XF86DRI /* Solaris 8 or later? */ #undef __SOL8__ +#endif /* _XORG_CONFIG_H_ */ -- cgit v1.2.3