[nas] [patch] remove servermd.h

Stefan Huehner stefan at huehner.org
Mon Aug 21 09:49:37 MDT 2006


i've check the usage of the defines inside servermd.h. None of them
besides one is used in the nas source tree. The potentially used portion

#ifdef stellar

 * Use SysV random number generator.
#define random rand

#endif /* stellar */

But as servermd.h is nevert included in a file which used the random function. This isn't an issue as well.

The attached patch removes the inclusion of servermd.h in 3 files and its reference in 'config/filelist'. Additionally an 'svn remove server/include/servermd.h' should be issued.

Please recheck and consider applying the patch/removing servermd.h


-------------- next part --------------
 #endif /* SERVERMD_H */
Index: server/dia/dispatch.c
--- server/dia/dispatch.c	(revision 181)
+++ server/dia/dispatch.c	(working copy)
@@ -52,7 +52,6 @@
 #include "dixstruct.h"
 #include "osstruct.h"
 #include "opaque.h"
-#include "servermd.h"
 extern void ProcessAudioEvents(), SendAuErrorToClient(),
 SwapConnClientPrefix(), ResetCurrentRequest(), WriteToClient();
Index: server/dia/main.c
--- server/dia/main.c	(revision 181)
+++ server/dia/main.c	(working copy)
@@ -61,7 +61,6 @@
 #include "resource.h"
 #include "dixstruct.h"
 #include "opaque.h"
-#include "servermd.h"
 #include "site.h"
 #include "globals.h"
 #include "nasconf.h"
Index: server/dia/audispatch.c
--- server/dia/audispatch.c	(revision 181)
+++ server/dia/audispatch.c	(working copy)
@@ -26,7 +26,6 @@
 #include        "release.h"
 #include        "misc.h"
 #include        "dixstruct.h"
-#include        "servermd.h"    /* VENDOR release & strings */
 #include        <audio/audio.h>
 #include        <audio/Aproto.h>
 #include        "au.h"
Index: config/filelist
--- config/filelist	(revision 181)
+++ config/filelist	(working copy)
@@ -620,7 +620,6 @@

More information about the Nas mailing list