Dead code removal

Remove a whole bunch of code that was never built, be it entire files or
just dead ifdefs.

5 files changed, 10 insertions, 144 deletions

diff --git a/include/dix-config.h.in b/include/dix-config.h.in
index 3b60fb1ba..c739d190d 100644
--- a/include/dix-config.h.in
+++ b/include/dix-config.h.in
@@ -294,9 +294,6 @@
 /* Support Secure RPC ("SUN-DES-1") authentication for X11 clients */
 #undef SECURE_RPC
 
-/* Use a lock to prevent multiple servers on a display */
-#undef SERVER_LOCK
-
 /* Support SHAPE extension */
 #undef SHAPE
 
diff --git a/include/os.h b/include/os.h
index 7d220fade..eff9b5297 100644
--- a/include/os.h
+++ b/include/os.h
@@ -245,10 +245,8 @@ extern OsSigHandlerPtr OsSignal(int /* sig */, OsSigHandlerPtr /* handler */);
 
 extern int auditTrailLevel;
 
-#ifdef SERVER_LOCK
 extern void LockServer(void);
 extern void UnlockServer(void);
-#endif
 
 extern int OsLookupColor(
     int	/*screen*/,
diff --git a/include/regionstr.h b/include/regionstr.h
index 5a79b1228..db712f8ae 100644
--- a/include/regionstr.h
+++ b/include/regionstr.h
@@ -131,31 +131,6 @@ extern RegDataRec miBrokenData;
 #define REGION_BREAK(_pScreen, _pReg) \
     miRegionBreak(_pReg)
 
-#ifdef DONT_INLINE_REGION_OPS
-
-#define REGION_INIT(_pScreen, _pReg, _rect, _size) \
-    miRegionInit(_pReg, _rect, _size)
-
-#define REGION_UNINIT(_pScreen, _pReg) \
-    miRegionUninit(_pReg)
-
-#define REGION_RESET(_pScreen, _pReg, _pBox) \
-    miRegionReset(_pReg, _pBox)
-
-#define REGION_NOTEMPTY(_pScreen, _pReg) \
-    miRegionNotEmpty(_pReg)
-
-#define REGION_BROKEN(_pScreen, _pReg) \
-    miRegionBroken(_pReg)
-
-#define REGION_EMPTY(_pScreen, _pReg) \
-    miRegionEmpty(_pReg)
-
-#define REGION_EXTENTS(_pScreen, _pReg) \
-    miRegionExtents(_pReg)
-
-#else /* inline certain simple region ops for performance */
-
 #define REGION_INIT(_pScreen, _pReg, _rect, _size) \
 { \
     if ((_rect) != NULL)				\
@@ -216,8 +191,6 @@ extern RegDataRec miBrokenData;
     (_pReg)->data = &miEmptyData; \
 }
 
-#endif /* DONT_INLINE_REGION_OPS */
-
 #ifndef REGION_NULL
 #define REGION_NULL(_pScreen, _pReg) \
     REGION_INIT(_pScreen, _pReg, NullBox, 1)
diff --git a/include/servermd.h b/include/servermd.h
index 000056e7a..6624cd921 100644
--- a/include/servermd.h
+++ b/include/servermd.h
@@ -68,14 +68,6 @@ SOFTWARE.
  * GLYPHPADBYTES is used.
  */
 
-#ifdef vax
-
-#define IMAGE_BYTE_ORDER	LSBFirst        /* Values for the VAX only */
-#define BITMAP_BIT_ORDER	LSBFirst
-#define	GLYPHPADBYTES		1
-
-#endif /* vax */
-
 #ifdef __avr32__
 
 #define IMAGE_BYTE_ORDER        MSBFirst
@@ -87,17 +79,7 @@ SOFTWARE.
 #ifdef __arm32__
 
 #define IMAGE_BYTE_ORDER        LSBFirst
-
-# if defined(XF86MONOVGA) || defined(XF86VGA16) || defined(XF86MONO)
-#  define BITMAP_BIT_ORDER      MSBFirst
-# else
-#  define BITMAP_BIT_ORDER      LSBFirst
-# endif
-
-# if defined(XF86MONOVGA) || defined(XF86VGA16)
-#  define BITMAP_SCANLINE_UNIT  8
-# endif
-
+#define BITMAP_BIT_ORDER        LSBFirst
 #define GLYPHPADBYTES           4
 
 #endif /* __arm32__ */
@@ -193,22 +175,6 @@ SOFTWARE.
 
 #endif /* ibm */
 
-#if defined (M4310) || defined(M4315) || defined(M4317) || defined(M4319) || defined(M4330)
-
-#define IMAGE_BYTE_ORDER	MSBFirst        /* Values for Pegasus only */
-#define BITMAP_BIT_ORDER	MSBFirst
-#define GLYPHPADBYTES		4
-
-#endif /* tektronix */
-
-#ifdef macII
-
-#define IMAGE_BYTE_ORDER      	MSBFirst        /* Values for the MacII only */
-#define BITMAP_BIT_ORDER      	MSBFirst
-#define GLYPHPADBYTES         	4
-
-#endif /* macII */
-
 #if (defined(mips) || defined(__mips)) && !defined(sgi)
 
 #if defined(MIPSEL) || defined(__MIPSEL__)
@@ -223,19 +189,9 @@ SOFTWARE.
 
 #endif /* mips */
 
-#if defined(__alpha) || defined(__alpha__) || defined(__alphaCross)
+#if defined(__alpha) || defined(__alpha__)
 # define IMAGE_BYTE_ORDER	LSBFirst	/* Values for the Alpha only */
-
-# if defined(XF86MONOVGA) || defined(XF86VGA16) || defined(XF86MONO)
-#  define BITMAP_BIT_ORDER      MSBFirst
-# else
-#  define BITMAP_BIT_ORDER      LSBFirst
-# endif
-
-# if defined(XF86MONOVGA) || defined(XF86VGA16)
-#  define BITMAP_SCANLINE_UNIT  8
-# endif
-
+# define BITMAP_BIT_ORDER       LSBFirst
 # define GLYPHPADBYTES		4
 
 #endif /* alpha */
@@ -264,60 +220,20 @@ SOFTWARE.
 
 
 #if defined(__ia64__) || defined(ia64)
-# define IMAGE_BYTE_ORDER	LSBFirst
-
-# if defined(XF86MONOVGA) || defined(XF86VGA16) || defined(XF86MONO)
-#  define BITMAP_BIT_ORDER      MSBFirst
-# else
-#  define BITMAP_BIT_ORDER      LSBFirst
-# endif
-
-# if defined(XF86MONOVGA) || defined(XF86VGA16)
-#  define BITMAP_SCANLINE_UNIT  8
-# endif
 
+# define IMAGE_BYTE_ORDER	LSBFirst
+# define BITMAP_BIT_ORDER       LSBFirst
 # define GLYPHPADBYTES		4
 
 #endif /* ia64 */
 
 #if defined(__amd64__) || defined(amd64) || defined(__amd64)
 # define IMAGE_BYTE_ORDER	LSBFirst
-
-# if defined(XF86MONOVGA) || defined(XF86VGA16) || defined(XF86MONO)
-#  define BITMAP_BIT_ORDER      MSBFirst
-# else
-#  define BITMAP_BIT_ORDER      LSBFirst
-# endif
-
-# if defined(XF86MONOVGA) || defined(XF86VGA16)
-#  define BITMAP_SCANLINE_UNIT  8
-# endif
-
+# define BITMAP_BIT_ORDER       LSBFirst
 # define GLYPHPADBYTES		4
 /* ???? */
 #endif /* AMD64 */
 
-#ifdef stellar
-
-#define IMAGE_BYTE_ORDER	MSBFirst       /* Values for the stellar only*/
-#define BITMAP_BIT_ORDER	MSBFirst
-#define	GLYPHPADBYTES		4
-#define IMAGE_BUFSIZE		(64*1024)
-/*
- * Use SysV random number generator.
- */
-#define random rand
-
-#endif /* stellar */
-
-#ifdef luna
-
-#define IMAGE_BYTE_ORDER        MSBFirst   	/* Values for the OMRON only*/
-#define BITMAP_BIT_ORDER	MSBFirst
-#define	GLYPHPADBYTES		4
-
-#endif /* luna */
-
 #if	(defined(SVR4) && (defined(__i386__) || (defined(__i386)))) ||	\
 	defined(__alpha__) || defined(__alpha) || \
 	defined(__i386__) || defined(__QNX__) || \
@@ -328,28 +244,13 @@ SOFTWARE.
 #endif
 
 #ifndef BITMAP_BIT_ORDER
-# if defined(XF86MONOVGA) || defined(XF86VGA16) || defined(XF86MONO)
-#  define BITMAP_BIT_ORDER      MSBFirst
-# else
-#  define BITMAP_BIT_ORDER      LSBFirst
-# endif
-#endif
-
-#ifndef BITMAP_SCANLINE_UNIT
-# if defined(XF86MONOVGA) || defined(XF86VGA16)
-#  define BITMAP_SCANLINE_UNIT  8
-# endif
+# define BITMAP_BIT_ORDER      LSBFirst
 #endif
 
 #ifndef GLYPHPADBYTES
 #define GLYPHPADBYTES           4
 #endif
 
-#ifdef XSVGA
-#define AVOID_GLYPHBLT
-#define NO_ONE_RECT
-#endif
-
 #endif /* SVR4 / BSD / i386 */
 
 #if defined (linux) && defined (__mc68000__)
@@ -368,7 +269,7 @@ SOFTWARE.
 
 #endif
 
-/* linux on the Compaq Itsy */
+/* linux on ARM */
 #if defined(linux) && defined(__arm__)
 #define IMAGE_BYTE_ORDER	LSBFirst
 #define BITMAP_BIT_ORDER	LSBFirst
@@ -383,8 +284,8 @@ SOFTWARE.
 #endif /* linux/s390 */ 
 
 /* size of buffer to use with GetImage, measured in bytes. There's obviously
- * a trade-off between the amount of stack (or whatever ALLOCATE_LOCAL gives
- * you) used and the number of times the ddx routine has to be called.
+ * a trade-off between the amount of heap used and the number of times the
+ * ddx routine has to be called.
  */
 #ifndef IMAGE_BUFSIZE
 #define IMAGE_BUFSIZE		(64*1024)
diff --git a/include/xorg-server.h.in b/include/xorg-server.h.in
index bab9bb9d2..17fa03681 100644
--- a/include/xorg-server.h.in
+++ b/include/xorg-server.h.in
@@ -70,9 +70,6 @@
 /* Support MIT-SCREEN-SAVER extension */
 #undef SCREENSAVER
 
-/* Use a lock to prevent multiple servers on a display */
-#undef SERVER_LOCK
-
 /* Support SHAPE extension */
 #undef SHAPE