[nas] [patch] remove osstruct.h

[Stefan Huehner]

Hi,

the only remaining two lines in osstruct.h are:

#include "os.h"
#include "misc.h"

As "os.h" already includes "misc.h" the only remaining one is the
inclusion of "os.h".

The attached patch therefore modifies the two users ostruct.h to
directly include os.h (which includes misc.h) and removes the osstruct.h
line in config/filelist. Is an additional "svn remove
server/include/osstruct.h" is used we can get rid of osstruct.h
completey.

Please recheck and consider applying.

Regards,
Stefan
-------------- next part --------------
Index: config/filelist
===================================================================
--- config/filelist	(revision 182)
+++ config/filelist	(working copy)
@@ -618,7 +618,6 @@
 ./server/include/misc.h
 ./server/include/opaque.h
 ./server/include/os.h
-./server/include/osstruct.h
 ./server/include/resource.h
 ./server/include
 ./server/os/hpsocket.c
Index: server/os/connection.c
===================================================================
--- server/os/connection.c	(revision 182)
+++ server/os/connection.c	(working copy)
@@ -151,7 +151,7 @@
 #if !defined(AMOEBA) && !defined(_MINIX)
 #include <sys/uio.h>
 #endif
-#include "osstruct.h"
+#include "os.h"
 #include "osdep.h"
 #include "opaque.h"
 #include "dixstruct.h"
Index: server/dia/dispatch.c
===================================================================
--- server/dia/dispatch.c	(revision 182)
+++ server/dia/dispatch.c	(working copy)
@@ -50,7 +50,7 @@
 #include        <audio/audio.h>
 #include        <audio/Aproto.h>
 #include "dixstruct.h"
-#include "osstruct.h"
+#include "os.h"
 #include "opaque.h"
 
 extern void ProcessAudioEvents(), SendAuErrorToClient(),