Windows: more roken.h include corrections

Change-Id: I02d4347b870ff1e06b4f144bedb37d50c697c5ba
Reviewed-on: http://gerrit.openafs.org/7795
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
Tested-by: Jeffrey Altman <jaltman@your-file-system.com>

diff --git a/src/WINNT/afsd/cm_config.c b/src/WINNT/afsd/cm_config.c
index ef853e1980c3db103a17abd2434c149f00822d60..41cec8dd721233c5e084a5e1dda7dd71beada6d3 100644 (file)
--- a/src/WINNT/afsd/cm_config.c
+++ b/src/WINNT/afsd/cm_config.c
@@ -10,21 +10,19 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
+
 #include <roken.h>
 
 #include <windows.h>
 #include <winsock2.h>
 #include <shlwapi.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
 #include <strsafe.h>
 
 #include "afsd.h"
 #include <WINNT\afssw.h>
 #include <WINNT\afsreg.h>
 
-#include <afs/stds.h>
 #include <afs/cellconfig.h>
 
 #include "cm_dns.h"

diff --git a/src/WINNT/afsd/cm_nls.c b/src/WINNT/afsd/cm_nls.c
index deba683b4d4a6b05e89eb7abebe2c6f57cd38c38..9b70b727b6cc9a4bf95fcede284507d84f6b33bd 100644 (file)
--- a/src/WINNT/afsd/cm_nls.c
+++ b/src/WINNT/afsd/cm_nls.c
@@ -22,12 +22,14 @@
  * SOFTWARE.
  */
 
+#include <afsconfig.h>
+#include <afs/param.h>
+#include <afs/stds.h>
+#include <roken.h>
+
 #include <windows.h>
-#include <stdlib.h>
 #include <wchar.h>
 #include <strsafe.h>
-#include <stdio.h>
-#include <errno.h>
 
 #include "cm_nls.h"
 

diff --git a/src/WINNT/afsd/cm_vnodeops.c b/src/WINNT/afsd/cm_vnodeops.c
index 21f697e443ee6f8cdebde3857ad42e078e8cf40a..03aa0bb0fc5ca6bf7e23999d4a3b6683612b17fd 100644 (file)
--- a/src/WINNT/afsd/cm_vnodeops.c
+++ b/src/WINNT/afsd/cm_vnodeops.c
@@ -9,18 +9,13 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <afs/stds.h>
 #include <roken.h>
 
-#include <afs/stds.h>
 #include <afs/unified_afs.h>
 
 #include <windows.h>
 #include <winsock2.h>
-#include <stddef.h>
-#include <malloc.h>
-#include <string.h>
-#include <stdlib.h>
-#include <errno.h>
 
 #include <osi.h>
 

diff --git a/src/WINNT/afsrdr/user/RDRInit.cpp b/src/WINNT/afsrdr/user/RDRInit.cpp
index 0b624963feb66df01113e27e3cc89fc5988be92b..11efc3f7f4d360b19a197975d2705ada3574a99e 100644 (file)
--- a/src/WINNT/afsrdr/user/RDRInit.cpp
+++ b/src/WINNT/afsrdr/user/RDRInit.cpp
@@ -29,6 +29,12 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+extern "C" {
+#include <afsconfig.h>
+#include <afs/param.h>
+#include <afs/stds.h>
+}
+
 #ifndef _WIN32_WINNT
 #define _WIN32_WINNT 0x0500
 #endif
@@ -42,10 +48,7 @@
 #include <windows.h>
 typedef LONG NTSTATUS, *PNTSTATUS;      // not declared in ntstatus.h
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <errno.h>
+#include <roken.h>
 
 #include <devioctl.h>
 

diff --git a/src/WINNT/afsreg/afsreg.c b/src/WINNT/afsreg/afsreg.c
index 3564c3ca77f85ae63f33c9d2ef1a237904e5ee49..4bab463bc4b919f00e10e8769146e2dfc61cc209 100644 (file)
--- a/src/WINNT/afsreg/afsreg.c
+++ b/src/WINNT/afsreg/afsreg.c
@@ -7,14 +7,13 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
+#include <afsconfig.h>
 #include <afs/param.h>
 #include <afs/stds.h>
 
+#include <roken.h>
+
 #include <windows.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <string.h>
-#include <stdio.h>
 
 #include "afsreg.h"
 

diff --git a/src/WINNT/afsreg/afssw.c b/src/WINNT/afsreg/afssw.c
index 3c6025fef4543b1e7a816305e8dc19d49e374182..0fcbc77a7a31b78f19d14c2831ad6b1ffd41f79c 100644 (file)
--- a/src/WINNT/afsreg/afssw.c
+++ b/src/WINNT/afsreg/afssw.c
@@ -15,11 +15,6 @@
 
 #include <windows.h>
 #include <shlobj.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <string.h>
-#include <errno.h>
 
 #include <afs/errmap_nt.h>
 

diff --git a/src/WINNT/afsreg/syscfg.c b/src/WINNT/afsreg/syscfg.c
index ed278b6f2360096ff2a8cf8e1c879cb59ae994d5..174083029107ce6419d8f61a3810bdb1bd1abd5b 100644 (file)
--- a/src/WINNT/afsreg/syscfg.c
+++ b/src/WINNT/afsreg/syscfg.c
@@ -9,9 +9,13 @@
 
 /* Functions for accessing NT system configuration information. */
 
+#include <afsconfig.h>
+#include <afs/param.h>
+#include <afs/stds.h>
+
+#include <roken.h>
+
 #include <windows.h>
-#include <stdlib.h>
-#include <string.h>
 #include <winsock2.h>
 #include <iphlpapi.h>
 #include <iptypes.h>

diff --git a/src/WINNT/afsreg/vptab.c b/src/WINNT/afsreg/vptab.c
index 6488ef20765af07ec481b18e4f641db8a48031ae..01cb25af7cabcc42496ccf3ce26b1353fa018ded 100644 (file)
--- a/src/WINNT/afsreg/vptab.c
+++ b/src/WINNT/afsreg/vptab.c
@@ -9,15 +9,13 @@
 
 /* Functions and definitions for accessing the vice partition table */
 
+#include <afsconfig.h>
 #include <afs/param.h>
 #include <afs/stds.h>
 
+#include <roken.h>
+
 #include <windows.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <string.h>
-#include <errno.h>
-#include <ctype.h>
 
 #include <afs/errmap_nt.h>