summaryrefslogtreecommitdiff
path: root/include/xorg-server.h.in
diff options
context:
space:
mode:
authorKevin E Martin <kem@kem.org>2005-07-15 22:51:05 +0000
committerKevin E Martin <kem@kem.org>2005-07-15 22:51:05 +0000
commita407fa373bb72f29050e3f027042011075b3bdf0 (patch)
tree002e232489505a0ca8e4b3e7b2862b748c21dfa3 /include/xorg-server.h.in
parenteb6fa0dc15516a0a436090efc6d85f22baeec015 (diff)
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.
Diffstat (limited to 'include/xorg-server.h.in')
-rw-r--r--include/xorg-server.h.in10
1 files changed, 6 insertions, 4 deletions
diff --git a/include/xorg-server.h.in b/include/xorg-server.h.in
index 7d476d431..6018a9233 100644
--- a/include/xorg-server.h.in
+++ b/include/xorg-server.h.in
@@ -13,6 +13,9 @@
* However, it should be kept in sync with this file.
*/
+#ifndef _XORG_SERVER_H_
+#define _XORG_SERVER_H_
+
/* Support BigRequests extension */
#undef BIGREQS
@@ -161,7 +164,7 @@
#undef XLOADABLE
/* Build DRI extension */
-#undef XORGDRI
+#undef XF86DRI
/* Build Xorg server */
#undef XORGSERVER
@@ -202,9 +205,6 @@
/* X/Open-compliant source */
#undef _XOPEN_SOURCE
-/* XORGDRI internal define */
-#undef _XORGDRI_SERVER_
-
/* Vendor web address for support */
#undef __VENDORDWEBSUPPORT__
@@ -216,3 +216,5 @@
/* Name of X server */
#undef __XSERVERNAME__
+
+#endif /* _XORG_SERVER_H_ */