[nas] [patch] more include cleanup

Stefan Huehner stefan at huehner.org
Mon Aug 28 07:42:34 MDT 2006


Hi,

attached patch removes the defined VENDOR_STRING and VENDOR_RELEASE from
server/include/site.h as they aren't used in the 3 files including site.h.
Additionally the inclusions of site.h was removed from server/dia/main.c
as none of its defines is used in main.c

Regards,
Stefan

-------------- next part --------------
Index: server/include/site.h
===================================================================
--- server/include/site.h	(revision 222)
+++ server/include/site.h	(working copy)
@@ -24,24 +24,8 @@
 
 #ifndef SITE_H
 #define SITE_H
-/*
- * The vendor string identifies the vendor responsible for the
- * server executable.
- */
-#ifndef VENDOR_STRING
-#define VENDOR_STRING "MIT X Consortium"
-#endif
 
 /*
- * The vendor release number identifies, for the purpose of submitting
- * traceable bug reports, the release number of software produced
- * by the vendor.
- */
-#ifndef VENDOR_RELEASE
-#define VENDOR_RELEASE  5000
-#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.
  */
Index: server/dia/main.c
===================================================================
--- server/dia/main.c	(revision 222)
+++ server/dia/main.c	(working copy)
@@ -61,7 +61,6 @@
 #include "resource.h"
 #include "dixstruct.h"
 #include "opaque.h"
-#include "site.h"
 #include "globals.h"
 #include "nasconf.h"
 #include "release.h"


More information about the Nas mailing list