From dda10c9066a660b647384179f82e1da8e063264f Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniel@fooishbar.org>
Date: Mon, 5 Nov 2007 16:28:35 +0000
Subject: Remove all traces of external RGB database (and Speedo)

Remove all references to an external RGB database (which hasn't been enabled
for a very long time).  Also get rid of some references to Speedo fonts.
---
 include/dix-config.h.in  | 9 ---------
 include/globals.h        | 1 -
 include/site.h           | 3 ---
 include/xorg-server.h.in | 6 ------
 4 files changed, 19 deletions(-)

(limited to 'include')

diff --git a/include/dix-config.h.in b/include/dix-config.h.in
index 5635d64ae..d105e511c 100644
--- a/include/dix-config.h.in
+++ b/include/dix-config.h.in
@@ -326,12 +326,6 @@
 /* Support UNIX socket connections */
 #undef UNIXCONN
 
-/* Use builtin rgb color database */
-#undef USE_RGB_BUILTIN
-
-/* Use rgb.txt directly */
-#undef USE_RGB_TXT
-
 /* Define to use byteswap macros from <sys/endian.h> */
 #undef USE_SYS_ENDIAN_H
 
@@ -464,9 +458,6 @@
 /* Define to 1 if unsigned long is 64 bits. */
 #undef _XSERVER64
 
-/* Define to location of RGB database */
-#undef RGB_DB
-
 /* System is BSD-like */
 #undef CSRG_BASED
 
diff --git a/include/globals.h b/include/globals.h
index e23ce7798..b230dfc37 100644
--- a/include/globals.h
+++ b/include/globals.h
@@ -16,7 +16,6 @@ extern Bool screenSaverSuspended;
 #endif
 
 extern char *defaultFontPath;
-extern char *rgbPath;
 extern int monitorResolution;
 extern Bool loadableFonts;
 extern int defaultColorVisualClass;
diff --git a/include/site.h b/include/site.h
index 5b9f25815..279cf2d70 100644
--- a/include/site.h
+++ b/include/site.h
@@ -75,9 +75,6 @@ SOFTWARE.
 #ifndef COMPILEDDEFAULTFONTPATH
 #define COMPILEDDEFAULTFONTPATH	"/usr/lib/X11/fonts/misc/"
 #endif
-#ifndef RGB_DB
-#define RGB_DB			"/usr/lib/X11/rgb"
-#endif
 
 /*
  * The following constants contain default values for all of the variables 
diff --git a/include/xorg-server.h.in b/include/xorg-server.h.in
index c117dfa33..2a0a5f5e2 100644
--- a/include/xorg-server.h.in
+++ b/include/xorg-server.h.in
@@ -109,12 +109,6 @@
 /* Support UNIX socket connections */
 #undef UNIXCONN
 
-/* Use builtin rgb color database */
-#undef USE_RGB_BUILTIN
-
-/* Use rgb.txt directly */
-#undef USE_RGB_TXT
-
 /* unaligned word accesses behave as expected */
 #undef WORKING_UNALIGNED_INT
 
-- 
cgit v1.2.3