[nas] [patch] more include file cleanup

Stefan Huehner stefan at huehner.org
Sat Aug 19 06:34:54 MDT 2006


Hi,

attached patch removes most the the content of site.h as it is unused
inside the nas code.

Regards,
Stefan

-------------- next part --------------
--- server/include/site.h	(revision 179)
+++ server/include/site.h	(working copy)
@@ -42,50 +42,11 @@
 #endif
 
 /*
- * The following constants are provided solely as a last line of defense.  The
- * normal build ALWAYS overrides them using a special rule given in
- * server/dix/Imakefile.  If you want to change either of these constants, 
- * you should set the DefaultFontPath or DefaultRGBDatabase configuration 
- * parameters.
- * DO NOT CHANGE THESE VALUES OR THE DIX IMAKEFILE!
- */
-#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 
  * that can be initialized on the server command line or in the environment.
  */
-#define COMPILEDDEFAULTFONT     "fixed"
-#define COMPILEDCURSORFONT      "cursor"
-#ifndef COMPILEDDISPLAYCLASS
-#define COMPILEDDISPLAYCLASS    "MIT-unspecified"
-#endif
 #define DEFAULT_TIMEOUT         60      /* seconds */
-#define DEFAULT_KEYBOARD_CLICK  0
-#define DEFAULT_BELL            50
-#define DEFAULT_BELL_PITCH      400
-#define DEFAULT_BELL_DURATION   100
-#define DEFAULT_AUTOREPEAT      FALSE
-#define DEFAULT_AUTOREPEATS     {\
-        0, 0, 0, 0, 0, 0, 0, 0,\
-        0, 0, 0, 0, 0, 0, 0, 0,\
-        0, 0, 0, 0, 0, 0, 0, 0,\
-        0, 0, 0, 0, 0, 0, 0, 0 }
-#define DEFAULT_LEDS            0x0     /* all off */
-#define DEFAULT_LEDS_MASK       0xffffffff      /* 32 */
-#define DEFAULT_INT_RESOLUTION          1000
-#define DEFAULT_INT_MIN_VALUE           0
-#define DEFAULT_INT_MAX_VALUE           100
-#define DEFAULT_INT_DISPLAYED           0
 
-#define DEFAULT_PTR_NUMERATOR   2
-#define DEFAULT_PTR_DENOMINATOR 1
-#define DEFAULT_PTR_THRESHOLD   4
 
 #ifndef DEFAULT_ACCESS_CONTROL
 #define DEFAULT_ACCESS_CONTROL TRUE


More information about the Nas mailing list