STABLE12-winnt-include-sanity-20030314

FIXES 1332

include headers by their usual name instead of trying to be special


(cherry picked from commit 48acf9c2d7)

src/WINNT/afsd/cm_conn.c

@@ -18,7 +18,7 @@
 #include <osi.h>
 #include <rx/rx.h>
 #ifndef DJGPP
-#include <rxkad.h>
+#include <rx/rxkad.h>
 #else
 #include <rx/rxkad.h>
 #endif

src/WINNT/afsd/cm_ioctl.c

@@ -30,7 +30,7 @@
 #include "smb.h"
 
 #ifndef DJGPP
-#include <rxkad.h>
+#include <rx/rxkad.h>
 #include "afsrpc.h"
 #else
 #include <rx/rxkad.h>

src/WINNT/afsd/cm_rpc.c

@@ -26,7 +26,7 @@
 
 #include "smb.h"
 
-#include <rxkad.h>
+#include <rx/rxkad.h>
 
 /*
  * The motivation for this whole module is that in transmitting tokens

src/libacl/aclprocs.c

@@ -29,7 +29,7 @@ RCSID("$Header$");
 #endif
 #include <rx/xdr.h>
 #include <rx/rx.h>
-#include <ptclient.h>
+#include <afs/ptclient.h>
 #include "acl.h"
 
 #ifdef AFS_PTHREAD_ENV

src/libacl/netprocs.c

@@ -26,7 +26,7 @@ RCSID("$Header$");
 #endif
 #include <rx/xdr.h>
 #include <rx/rx.h>
-#include <ptclient.h>
+#include <afs/ptclient.h>
 #include "acl.h"
 
 int acl_HtonACL(acl)

src/rx/rx.c

@@ -79,7 +79,7 @@ extern afs_int32 afs_termState;
 #ifdef AFS_NT40_ENV
 # include <stdlib.h>
 # include <fcntl.h>
-# include <afsutil.h>
+# include <afs/afsutil.h>
 #else
 # include <sys/socket.h>
 # include <sys/file.h>

src/rx/rx_pthread.c

@@ -33,8 +33,8 @@ RCSID("$Header$");
 # include <sys/time.h>
 #endif
 #include <sys/stat.h>
-#include <rx.h>
-#include <rx_globals.h>
+#include <rx/rx.h>
+#include <rx/rx_globals.h>
 #include <assert.h>
 #include <rx/rx_pthread.h>
 

src/util/secutil_nt.c

@@ -9,12 +9,12 @@
 
 /* Security related utilities for the Windows platform */
 
-#include <param.h>
+#include <afs/param.h>
 #include <afsconfig.h>
 
 RCSID("$Header$");
 
-#include <stds.h>
+#include <afs/stds.h>
 
 #include <stddef.h>
 #include <stdlib.h>