From 7ec46ced616f7af72fa3ce1d60304ae475977a28 Mon Sep 17 00:00:00 2001
From: Jeffrey Altman <jaltman@your-file-system.com>
Date: Fri, 20 Jul 2012 00:59:33 -0400
Subject: [PATCH] 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>
---
 src/WINNT/afsd/cm_config.c        |  6 ++----
 src/WINNT/afsd/cm_nls.c           |  8 +++++---
 src/WINNT/afsd/cm_vnodeops.c      |  7 +------
 src/WINNT/afsrdr/user/RDRInit.cpp | 11 +++++++----
 src/WINNT/afsreg/afsreg.c         |  7 +++----
 src/WINNT/afsreg/afssw.c          |  5 -----
 src/WINNT/afsreg/syscfg.c         |  8 ++++++--
 src/WINNT/afsreg/vptab.c          |  8 +++-----
 8 files changed, 27 insertions(+), 33 deletions(-)

diff --git a/src/WINNT/afsd/cm_config.c b/src/WINNT/afsd/cm_config.c
index ef853e198..41cec8dd7 100644
--- 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 deba683b4..9b70b727b 100644
--- 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 21f697e44..03aa0bb0f 100644
--- 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 0b624963f..11efc3f7f 100644
--- 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 3564c3ca7..4bab463bc 100644
--- 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 3c6025fef..0fcbc77a7 100644
--- 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 ed278b6f2..174083029 100644
--- 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 6488ef207..01cb25af7 100644
--- 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>
 
-- 
2.39.5