winnt-include-sanity-20030314

FIXES 1332

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

diff --git a/src/WINNT/afsd/cm_conn.c b/src/WINNT/afsd/cm_conn.c
index 3b326022e3c4942775cc74755394ece94fd4ae55..f38d6f6f8f72189c931e2cd437cd36d6933c73fb 100644 (file)
--- a/src/WINNT/afsd/cm_conn.c
+++ b/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

diff --git a/src/WINNT/afsd/cm_ioctl.c b/src/WINNT/afsd/cm_ioctl.c
index 51ba32c20330b7fa2b4336c6538e5d089999dc60..ac512570155badef37e9e0dbe73c0378d7855e70 100644 (file)
--- a/src/WINNT/afsd/cm_ioctl.c
+++ b/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>

diff --git a/src/WINNT/afsd/cm_rpc.c b/src/WINNT/afsd/cm_rpc.c
index 1c250caf969bd2dcc4b11dee08b14921aca3fd37..882e056a6fdec389284bb41bffe344c32c895b93 100644 (file)
--- a/src/WINNT/afsd/cm_rpc.c
+++ b/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

diff --git a/src/libacl/aclprocs.c b/src/libacl/aclprocs.c
index cb955ea9c77b5f33e367e908a0a9ca9fc4116ad1..33fd15eb16cf153ed5606e41d188a5c51b3ef5a7 100644 (file)
--- a/src/libacl/aclprocs.c
+++ b/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

diff --git a/src/libacl/netprocs.c b/src/libacl/netprocs.c
index 62f118e60653b31e8bb0ce6166b7036d750d39c9..c8ef607a1efde31b3a2799582a3ca727e267bf0a 100644 (file)
--- a/src/libacl/netprocs.c
+++ b/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)

diff --git a/src/rx/rx.c b/src/rx/rx.c
index e9a345c33087982185ca5b3939d5b2f139d55d19..27f47c51833ebcd579b9edd81982542177540277 100644 (file)
--- a/src/rx/rx.c
+++ b/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>

diff --git a/src/rx/rx_pthread.c b/src/rx/rx_pthread.c
index dbf6b9bdda5e0bbf9dc40e340126a8c6d345f4f3..43d566918ae9f1875096bef644427204d5701eb6 100644 (file)
--- a/src/rx/rx_pthread.c
+++ b/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>
 

diff --git a/src/util/secutil_nt.c b/src/util/secutil_nt.c
index 3d79128048beb319fafdbd9cf01889a78ff20efc..405c907a2f67bf1305405b2b0edf3ab0141e705a 100644 (file)
--- a/src/util/secutil_nt.c
+++ b/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>