[nas] [patch] more header cleanup

[Stefan Huehner]

Hi,

the attached patch removes more apparently unused stuff from
'server/include'.

Plase check and consider applying.

Regards,
Stefan

-------------- next part --------------
Index: server/include/misc.h
===================================================================
--- server/include/misc.h	(revision 160)
+++ server/include/misc.h	(working copy)
@@ -46,12 +46,9 @@
 #define MAXSCREENS	3
 #define MAXCLIENTS	128
 #define MAXFORMATS	8
-#define MAXVISUALS_PER_SCREEN 50
 
 typedef unsigned char *pointer;
 typedef int Bool;
-typedef unsigned long PIXEL;
-typedef unsigned long ATOM;
 
 
 #ifndef TRUE
@@ -61,18 +58,9 @@
 #include "os.h" 	/* for ALLOCATE_LOCAL and DEALLOCATE_LOCAL */
 #include <X11/Xfuncs.h> /* for bcopy, bzero, and bcmp */
 
-#define NullBox ((BoxPtr)0)
-#define MILLI_PER_MIN (1000 * 60)
 #define MILLI_PER_SECOND (1000)
 
-    /* this next is used with None and ParentRelative to tell
-       PaintWin() what to use to paint the background. Also used
-       in the macro IS_VALID_PIXMAP */
 
-#define USE_BACKGROUND_PIXEL 3
-#define USE_BORDER_PIXEL 3
-
-
 /* byte swap a long literal */
 #define lswapl(x) ((((x) & 0xff) << 24) |\
 		   (((x) & 0xff00) << 8) |\
Index: server/include/os.h
===================================================================
--- server/include/os.h	(revision 160)
+++ server/include/os.h	(working copy)
@@ -32,13 +32,6 @@
 #include <alloca.h>
 #endif
 
-#define NullFID ((FID) 0)
-
-#define SCREEN_SAVER_ON   0
-#define SCREEN_SAVER_OFF  1
-#define SCREEN_SAVER_FORCER 2
-#define SCREEN_SAVER_CYCLE  3
-
 #ifndef MAX_REQUEST_SIZE
 #define MAX_REQUEST_SIZE 65535
 #endif
@@ -46,9 +39,6 @@
 #define MAX_BIG_REQUEST_SIZE 1048575
 #endif
 
-typedef pointer	FID;
-typedef struct _NewClientRec *NewClientPtr;
-
 #ifndef NO_ALLOCA
 /*
  * os-dependent definition of local allocation and deallocation
Index: server/include/dix.h
===================================================================
--- server/include/dix.h	(revision 160)
+++ server/include/dix.h	(working copy)
@@ -73,7 +73,6 @@
       (*(pClient)->pSwapReplyFunc)(pClient, (int)(size), pbuf); \
    else (void) WriteToClient (pClient, (int)(size), (char *)(pbuf));
 
-typedef struct _TimeStamp *TimeStampPtr;
 typedef struct _Client *ClientPtr;
 
 typedef struct _WorkQueue	*WorkQueuePtr;
Index: server/include/site.h
===================================================================
--- server/include/site.h	(revision 160)
+++ server/include/site.h	(working copy)
@@ -87,13 +87,6 @@
 #define DEFAULT_PTR_DENOMINATOR	1
 #define DEFAULT_PTR_THRESHOLD	4
 
-#define DEFAULT_SCREEN_SAVER_TIME (10 * (60 * 1000))
-#define DEFAULT_SCREEN_SAVER_INTERVAL (10 * (60 * 1000))
-#define DEFAULT_SCREEN_SAVER_BLANKING PreferBlanking
-#define DEFAULT_SCREEN_SAVER_EXPOSURES AllowExposures
-#ifndef NOLOGOHACK
-#define DEFAULT_LOGO_SCREEN_SAVER 1
-#endif
 #ifndef DEFAULT_ACCESS_CONTROL
 #define DEFAULT_ACCESS_CONTROL TRUE
 #endif