libroken: Build on windows

A minimal change set to get libroken to build on Windows. Sadly,
libroken contains definitions for a number of platform compatibility
macros which were previously scattered throughout the windows code.
These scattered macros have to be removed in order to build libroken.

The impact of this removal is that a very large number of files
throughout the tree require the addition of "roken.h" to pick up the
new compatibility code. The bulk of this change is adding these
includes.

In addition, some of the added includes add roken dependencies to the
Unix build. So, also add libroken to the build rules in affected Unix
Makefiles.

Change-Id: Ifba431bd37e67b1e273fbc6f69b805a232193456
Reviewed-on: http://gerrit.openafs.org/3205
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>

NTMakefile

@@ -82,13 +82,20 @@ rx_headers:
 	$(NTMAKE_HEADERS)
 	$(CD) ..\..
 
-util_headers:
+util_headers: roken_headers
      @echo ***** $@
 	$(DOCD) $(SRC)\util
 	$(CD) $(SRC)\util
 	$(NTMAKE_HEADERS)
 	$(CD) ..\..
 
+roken_headers:
+     @echo ***** $@
+	$(DOCD) $(SRC)\roken
+	$(CD) $(SRC)\roken
+	$(NTMAKE_HEADERS)
+	$(CD) ..\..
+
 hcrypto_headers: util_headers
      @echo ***** $@
 	$(DOCD) $(SRC)\crypto\hcrypto
@@ -166,13 +173,20 @@ des: rxgen
 	$(NTMAKE)
 	$(CD) ..\..
 
-hcrypto: des
+hcrypto: roken
      @echo ***** $@
 	$(DOCD) $(SRC)\crypto\hcrypto
 	$(CD) $(SRC)\crypto\hcrypto
 	$(NTMAKE)
 	$(CD) ..\..\..
 
+roken: des
+     @echo ***** $@
+        $(DOCD) $(SRC)\roken
+	$(CD) $(SRC)\roken
+	$(NTMAKE)
+	$(CD) ..\..
+
 rx: hcrypto
      @echo ***** $@
 	$(DOCD) $(SRC)\$@

src/WINNT/afsadmsvr/TaAfsAdmSvr.cpp

@@ -10,8 +10,10 @@
 #include <winsock2.h>
 #include <ws2tcpip.h>
 
+#include <afsconfig.h>
 #include <afs/param.h>
 #include <afs/stds.h>
+#include <roken.h>
 
 #include "TaAfsAdmSvrInternal.h"
 

src/WINNT/afsadmsvr/TaAfsAdmSvrCallback.cpp

@@ -10,8 +10,10 @@
 #include <winsock2.h>
 #include <ws2tcpip.h>
 
+#include <afsconfig.h>
 #include <afs/param.h>
 #include <afs/stds.h>
+#include <roken.h>
 
 #include "TaAfsAdmSvrInternal.h"
 

src/WINNT/afsadmsvr/TaAfsAdmSvrCell.cpp

@@ -10,8 +10,10 @@
 #include <winsock2.h>
 #include <ws2tcpip.h>
 
+#include <afsconfig.h>
 #include <afs/param.h>
 #include <afs/stds.h>
+#include <roken.h>
 
 #include "TaAfsAdmSvrInternal.h"
 

src/WINNT/afsadmsvr/TaAfsAdmSvrDebug.cpp

@@ -11,8 +11,10 @@
 #include <ws2tcpip.h>
 
 extern "C" {
+#include <afsconfig.h>
 #include <afs/param.h>
 #include <afs/stds.h>
+#include <roken.h>
 }
 
 #include "TaAfsAdmSvrInternal.h"

src/WINNT/afsadmsvr/TaAfsAdmSvrGeneral.cpp

@@ -11,8 +11,10 @@
 #include <ws2tcpip.h>
 
 extern "C" {
+#include <afsconfig.h>
 #include <afs/param.h>
 #include <afs/stds.h>
+#include <roken.h>
 }
 
 #include "TaAfsAdmSvrInternal.h"

src/WINNT/afsadmsvr/TaAfsAdmSvrGroup.cpp

@@ -11,8 +11,10 @@
 #include <ws2tcpip.h>
 
 extern "C" {
+#include <afsconfig.h>
 #include <afs/param.h>
 #include <afs/stds.h>
+#include <roken.h>
 }
 
 #include "TaAfsAdmSvrInternal.h"

src/WINNT/afsadmsvr/TaAfsAdmSvrMain.cpp

@@ -11,8 +11,10 @@
 #include <ws2tcpip.h>
 
 extern "C" {
+#include <afsconfig.h>
 #include <afs/param.h>
 #include <afs/stds.h>
+#include <roken.h>
 }
 
 #include "TaAfsAdmSvrInternal.h"

src/WINNT/afsadmsvr/TaAfsAdmSvrProperties.cpp

@@ -11,8 +11,10 @@
 #include <ws2tcpip.h>
 
 extern "C" {
+#include <afsconfig.h>
 #include <afs/param.h>
 #include <afs/stds.h>
+#include <roken.h>
 }
 
 #include "TaAfsAdmSvrInternal.h"

src/WINNT/afsadmsvr/TaAfsAdmSvrSearch.cpp

@@ -11,8 +11,10 @@
 #include <ws2tcpip.h>
 
 extern "C" {
+#include <afsconfig.h>
 #include <afs/param.h>
 #include <afs/stds.h>
+#include <roken.h>
 }
 
 #include "TaAfsAdmSvrInternal.h"

src/WINNT/afsadmsvr/TaAfsAdmSvrUser.cpp

@@ -11,8 +11,10 @@
 #include <ws2tcpip.h>
 
 extern "C" {
+#include <afsconfig.h>
 #include <afs/param.h>
 #include <afs/stds.h>
+#include <roken.h>
 }
 
 #include "TaAfsAdmSvrInternal.h"

src/WINNT/afsapplib/al_browse.cpp

@@ -11,8 +11,11 @@
 #include <ws2tcpip.h>
 
 extern "C" {
+#include <afsconfig.h>
 #include <afs/param.h>
 #include <afs/stds.h>
+
+#include <roken.h>
 }
 
 #include <WINNT/afsapplib.h>

src/WINNT/afsapplib/al_creds.cpp

@@ -11,8 +11,10 @@
 #include <ws2tcpip.h>
 
 extern "C" {
+#include <afsconfig.h>
 #include <afs/param.h>
 #include <afs/stds.h>
+#include <roken.h>
 }
 
 #include <WINNT/afsapplib.h>

src/WINNT/afsapplib/al_dynlink.cpp

@@ -11,8 +11,10 @@
 #include <ws2tcpip.h>
 
 extern "C" {
+#include <afs/afsconfig.h>
 #include <afs/param.h>
 #include <afs/stds.h>
+#include <roken.h>
 }
 
 #include <WINNT/afsapplib.h>

src/WINNT/afsapplib/al_misc.cpp

@@ -11,8 +11,10 @@
 #include <ws2tcpip.h>
 
 extern "C" {
+#include <afsconfig.h>
 #include <afs/param.h>
 #include <afs/stds.h>
+#include <roken.h>
 }
 
 #include <WINNT/afsapplib.h>

src/WINNT/afsclass/afsclassfn.cpp

@@ -11,8 +11,10 @@
 #include <ws2tcpip.h>
 
 extern "C" {
+#include <afsconfig.h>
 #include <afs/param.h>
 #include <afs/stds.h>
+#include <roken.h>
 }
 
 #include <WINNT/afsclass.h>

src/WINNT/afsclass/c_agg.cpp

@@ -11,8 +11,10 @@
 #include <ws2tcpip.h>
 
 extern "C" {
+#include <afsconfig.h>
 #include <afs/param.h>
 #include <afs/stds.h>
+#include <roken.h>
 }
 
 #include <WINNT/afsclass.h>

src/WINNT/afsclass/c_cell.cpp

@@ -11,8 +11,10 @@
 #include <ws2tcpip.h>
 
 extern "C" {
+#include <afsconfig.h>
 #include <afs/param.h>
 #include <afs/stds.h>
+#include <roken.h>
 }
 
 #include <WINNT/afsclass.h>

src/WINNT/afsclass/c_grp.cpp

@@ -11,8 +11,10 @@
 #include <ws2tcpip.h>
 
 extern "C" {
+#include <afsconfig.h>
 #include <afs/param.h>
 #include <afs/stds.h>
+#include <roken.h>
 }
 
 #include <WINNT/afsclass.h>

src/WINNT/afsclass/c_ident.cpp

@@ -11,8 +11,10 @@
 #include <ws2tcpip.h>
 
 extern "C" {
+#include <afsconfig.h>
 #include <afs/param.h>
 #include <afs/stds.h>
+#include <roken.h>
 }
 
 #include <WINNT/afsclass.h>

src/WINNT/afsclass/c_identlist.cpp

@@ -11,8 +11,10 @@
 #include <ws2tcpip.h>
 
 extern "C" {
+#include <afsconfig.h>
 #include <afs/param.h>
 #include <afs/stds.h>
+#include <roken.h>
 }
 
 #include <WINNT/afsclass.h>

src/WINNT/afsclass/c_notify.cpp

@@ -11,8 +11,10 @@
 #include <ws2tcpip.h>
 
 extern "C" {
+#include <afsconfig.h>
 #include <afs/param.h>
 #include <afs/stds.h>
+#include <roken.h>
 }
 
 #include <WINNT/afsclass.h>

src/WINNT/afsclass/c_set.cpp

@@ -11,8 +11,10 @@
 #include <ws2tcpip.h>
 
 extern "C" {
+#include <afsconfig.h>
 #include <afs/param.h>
 #include <afs/stds.h>
+#include <roken.h>
 }
 
 #include <WINNT/afsclass.h>

src/WINNT/afsclass/c_svc.cpp

@@ -11,8 +11,10 @@
 #include <ws2tcpip.h>
 
 extern "C" {
+#include <afsconfig.h>
 #include <afs/param.h>
 #include <afs/stds.h>
+#include <roken.h>
 }
 
 #include <WINNT/afsclass.h>

src/WINNT/afsclass/c_svr.cpp

@@ -11,8 +11,10 @@
 #include <ws2tcpip.h>
 
 extern "C" {
+#include <afsconfig.h>
 #include <afs/param.h>
 #include <afs/stds.h>
+#include <roken.h>
 }
 
 #include <WINNT/afsclass.h>

src/WINNT/afsclass/c_usr.cpp

@@ -11,8 +11,10 @@
 #include <ws2tcpip.h>
 
 extern "C" {
+#include <afsconfig.h>
 #include <afs/param.h>
 #include <afs/stds.h>
+#include <roken.h>
 }
 
 #include <WINNT/afsclass.h>

src/WINNT/afsclass/internal.cpp

@@ -11,8 +11,10 @@
 #include <ws2tcpip.h>
 
 extern "C" {
+#include <afsconfig.h>
 #include <afs/param.h>
 #include <afs/stds.h>
+#include <roken.h>
 }
 
 #include <WINNT/afsclass.h>

src/WINNT/afsclass/worker.cpp

@@ -11,8 +11,10 @@
 #include <ws2tcpip.h>
 
 extern "C" {
+#include <afsconfig.h>
 #include <afs/param.h>
 #include <afs/stds.h>
+#include <roken.h>
 }
 
 #include <WINNT/afsclass.h>

src/WINNT/afsd/NTMakefile

@@ -230,7 +230,8 @@ CONF_DLLFILE = $(DESTDIR)\lib\libafsconf.dll
 
 CONF_DLLLIBS = \
     $(DESTDIR)\lib\afs\afsutil.lib \
-    $(DESTDIR)\lib\afs\afsreg.lib
+    $(DESTDIR)\lib\afs\afsreg.lib \
+    $(DESTDIR)\lib\afsroken.lib
 
 $(CONF_DLLFILE): $(CONFOBJS) $(OUT)\libafsconf.res $(CONF_DLLLIBS)
 	$(DLLGUILINK) -def:libafsconf.def  $(AFSD_SDKLIBS)
@@ -362,7 +363,8 @@ EXELIBS = \
 	$(DESTDIR)\lib\afsrx.lib \
 	$(DESTDIR)\lib\afslwp.lib \
 	$(DESTDIR)\lib\libosi.lib \
-	$(DESTDIR)\lib\libafsconf.lib
+	$(DESTDIR)\lib\libafsconf.lib \
+	$(DESTDIR)\lib\afsroken.lib
 
 EXELIBS2 = \
         $(DESTDIR)\lib\afsrpc.lib \
@@ -376,7 +378,8 @@ EXELIBS2 = \
 	$(DESTDIR)\lib\afsdes.lib \
 	$(DESTDIR)\lib\afslwp.lib \
 	$(DESTDIR)\lib\libosi.lib \
-	$(DESTDIR)\lib\libafsconf.lib
+	$(DESTDIR)\lib\libafsconf.lib \
+	$(DESTDIR)\lib\afsroken.lib
 
 EXELIBS3 = \
 	$(DESTDIR)\lib\afs\afscmd.lib \
@@ -429,6 +432,7 @@ AFSD_EXELIBS =\
 	$(DESTDIR)\lib\libafsconf.lib \
 	$(DESTDIR)\lib\afs\afsreg.lib \
 	$(DESTDIR)\lib\afspthread.lib \
+	$(DESTDIR)\lib\afsroken.lib \
         $(LANAHELPERLIB)
 
 $(AFSD_EXEFILE): $(OUT)\afsd.obj $(AFSDOBJS) $(OUT)\afsd.res  $(RXOBJS) $(AFSD_EXELIBS)

src/WINNT/afsd/afscpcc.c

@@ -5,6 +5,10 @@
  * This software has been released under the terms of the MIT License.  
  */
 
+#include <afsconfig.h>
+#include <afs/param.h>
+#include <roken.h>
+
 #include <windows.h>
 #include <afskfw.h>
 

src/WINNT/afsd/afsd_eventlog.c

@@ -7,6 +7,10 @@
 ////////////////////////////////////////////////////////////////////
 
 
+#include <afsconfig.h>
+#include <afs/param.h>
+#include <roken.h>
+
 #include <windows.h>
 #include <stdarg.h>
 #include <string.h>

src/WINNT/afsd/afsd_flushvol.c

@@ -6,7 +6,10 @@
 //
 /////////////////////////////////////////////////////////////////////
 
+#include <afsconfig.h>
 #include <afs/param.h>
+#include <roken.h>
+
 #include <afs/stds.h>
 
 #include <windows.h>

src/WINNT/afsd/afsd_init.c

@@ -7,7 +7,11 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
+#include <afsconfig.h>
 #include <afs/param.h>
+
+#include <roken.h>
+
 #include <afs/stds.h>
 #include <afs/afs_args.h>
 

src/WINNT/afsd/afsd_service.c

@@ -1,4 +1,8 @@
 
+#include <afsconfig.h>
+#include <afs/param.h>
+#include <roken.h>
+
 #include <afs/stds.h>
 
 #include <windows.h>

src/WINNT/afsd/afskfw.c

@@ -66,6 +66,10 @@
 /* Prevent inclusion of des.h to avoid conflicts with des types */
 #define NO_DES_H_INCLUDE
 
+#include <afsconfig.h>
+#include <afs/param.h>
+#include <roken.h>
+
 #include <osilog.h>
 #include <afs/ptserver.h>
 #include <afs/ptuser.h>

src/WINNT/afsd/afslogon.c

@@ -7,6 +7,10 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
+#include <afsconfig.h>
+#include <afs/param.h>
+#include <roken.h>
+
 #include "afslogon.h"
 
 #include <io.h>
@@ -18,7 +22,6 @@
 #include <lm.h>
 #include <nb30.h>
 
-#include <afs/param.h>
 #include <afs/stds.h>
 #include <afs/pioctl_nt.h>
 #include <afs/kautils.h>

src/WINNT/afsd/cklog.c

@@ -7,7 +7,11 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
+#include <afsconfig.h>
 #include <afs/param.h>
+
+#include <roken.h>
+
 #include <afs/stds.h>
 
 #include <windows.h>

src/WINNT/afsd/cm_access.c

@@ -7,7 +7,10 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
+#include <afsconfig.h>
 #include <afs/param.h>
+#include <roken.h>
+
 #include <afs/stds.h>
 
 #include <windows.h>

src/WINNT/afsd/cm_aclent.c

@@ -7,7 +7,10 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
+#include <afsconfig.h>
 #include <afs/param.h>
+#include <roken.h>
+
 #include <afs/stds.h>
 
 #include <windows.h>

src/WINNT/afsd/cm_btree.c

@@ -10,6 +10,10 @@
  * Thanks to Jan Jannink for B+ tree algorithms.
  */
 
+#include <afsconfig.h>
+#include <afs/param.h>
+#include <roken.h>
+
 #include <windows.h>
 #include <stdio.h>
 #include <stdlib.h>

src/WINNT/afsd/cm_buf.c

@@ -9,7 +9,10 @@
 
 /* Copyright (C) 1994 Cazamar Systems, Inc. */
 
+#include <afsconfig.h>
 #include <afs/param.h>
+#include <roken.h>
+
 #include <afs/stds.h>
 
 #include <windows.h>

src/WINNT/afsd/cm_callback.c

@@ -7,7 +7,10 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
+#include <afsconfig.h>
 #include <afs/param.h>
+#include <roken.h>
+
 #include <afs/afs_args.h>
 #include <afs/stds.h>
 

src/WINNT/afsd/cm_cell.c

@@ -7,7 +7,10 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
+#include <afsconfig.h>
 #include <afs/param.h>
+#include <roken.h>
+
 #include <afs/stds.h>
 
 #include <windows.h>

src/WINNT/afsd/cm_config.c

@@ -7,6 +7,11 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
+
+#include <afsconfig.h>
+#include <afs/param.h>
+#include <roken.h>
+
 #include <windows.h>
 #include <winsock2.h>
 #include <shlwapi.h>
@@ -19,7 +24,6 @@
 #include <WINNT\afssw.h>
 #include <WINNT\afsreg.h>
 
-#include <afs/param.h>
 #include <afs/stds.h>
 #include <afs/cellconfig.h>
 

src/WINNT/afsd/cm_conn.c

@@ -7,7 +7,10 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
+#include <afsconfig.h>
 #include <afs/param.h>
+#include <roken.h>
+
 #include <afs/stds.h>
 
 #include <windows.h>

src/WINNT/afsd/cm_daemon.c

@@ -7,7 +7,10 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
+#include <afsconfig.h>
 #include <afs/param.h>
+#include <roken.h>
+
 #include <afs/stds.h>
 
 #include <windows.h>

src/WINNT/afsd/cm_dcache.c

@@ -7,7 +7,11 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
+
+#include <afsconfig.h>
 #include <afs/param.h>
+#include <roken.h>
+
 #include <afs/stds.h>
 
 #include <windows.h>

src/WINNT/afsd/cm_dir.c

@@ -7,7 +7,10 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
+#include <afsconfig.h>
 #include <afs/param.h>
+#include <roken.h>
+
 #include <afs/stds.h>
 
 #include <windows.h>

src/WINNT/afsd/cm_dnlc.c

@@ -15,7 +15,10 @@
 **
 */
 
+#include <afsconfig.h>
 #include <afs/param.h>
+#include <roken.h>
+
 #include <afs/stds.h>
 
 #include <windows.h>

src/WINNT/afsd/cm_dns.c

@@ -6,7 +6,11 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
+
+#include <afsconfig.h>
 #include <afs/param.h>
+#include <roken.h>
+
 #include <afs/stds.h>
 #include <afs/cellconfig.h>
 #include <windows.h>

src/WINNT/afsd/cm_freelance.c

@@ -1,4 +1,7 @@
+#include <afsconfig.h>
 #include <afs/param.h>
+#include <roken.h>
+
 #include <afs/stds.h>
 
 #include <windows.h>

src/WINNT/afsd/cm_ioctl.c

@@ -7,7 +7,10 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
+#include <afsconfig.h>
 #include <afs/param.h>
+#include <roken.h>
+
 #include <afs/stds.h>
 #include <afs/cellconfig.h>
 #include <afs/afs_consts.h>

src/WINNT/afsd/cm_memmap.c

@@ -1,3 +1,8 @@
+
+#include <afsconfig.h>
+#include <afs/param.h>
+#include <roken.h>
+
 #include <windows.h>
 #include <tchar.h>
 #include "afsd.h"

src/WINNT/afsd/cm_performance.c

@@ -2,7 +2,11 @@
  *  Copyright (c) 2008 - Secure Endpoints Inc.
  */
 
+
+#include <afsconfig.h>
 #include <afs/param.h>
+#include <roken.h>
+
 #include <afs/stds.h>
 
 #include <windows.h>

src/WINNT/afsd/cm_rpc.c

@@ -7,7 +7,10 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
+#include <afsconfig.h>
 #include <afs/param.h>
+#include <roken.h>
+
 #include <afs/stds.h>
 
 #include <windows.h>

src/WINNT/afsd/cm_scache.c

@@ -7,7 +7,10 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
+#include <afsconfig.h>
 #include <afs/param.h>
+#include <roken.h>
+
 #include <afs/stds.h>
 
 #include <windows.h>

src/WINNT/afsd/cm_server.c

@@ -7,7 +7,10 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
+#include <afsconfig.h>
 #include <afs/param.h>
+#include <roken.h>
+
 #include <afs/stds.h>
 
 #include <windows.h>

src/WINNT/afsd/cm_user.c

@@ -7,7 +7,11 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
+
+#include <afsconfig.h>
 #include <afs/param.h>
+#include <roken.h>
+
 #include <afs/stds.h>
 
 #include <windows.h>

src/WINNT/afsd/cm_utils.c

@@ -7,7 +7,10 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
+#include <afsconfig.h>
 #include <afs/param.h>
+#include <roken.h>
+
 #include <afs/stds.h>
 
 #include <errno.h>

src/WINNT/afsd/cm_vnodeops.c

@@ -7,7 +7,10 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
+#include <afsconfig.h>
 #include <afs/param.h>
+#include <roken.h>
+
 #include <afs/stds.h>
 
 #include <windows.h>

src/WINNT/afsd/cm_volstat.c

@@ -31,7 +31,10 @@
  * Notification API
  */
 
+#include <afsconfig.h>
 #include <afs/param.h>
+#include <roken.h>
+
 #include <afs/stds.h>
 
 #include <windows.h>

src/WINNT/afsd/cm_volume.c

@@ -7,7 +7,10 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
+#include <afsconfig.h>
 #include <afs/param.h>
+#include <roken.h>
+
 #include <afs/stds.h>
 
 #include <windows.h>

src/WINNT/afsd/ctokens.c

@@ -7,7 +7,11 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
+#include <afsconfig.h>
 #include <afs/param.h>
+
+#include <roken.h>
+
 #include <afs/stds.h>
 
 #include <windows.h>

src/WINNT/afsd/cunlog.c

@@ -7,7 +7,10 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
+#include <afsconfig.h>
 #include <afs/param.h>
+
+#include <roken.h>
 #include <afs/stds.h>
 
 #include <afs/auth.h>

src/WINNT/afsd/fs.c

@@ -7,7 +7,10 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
+#include <afsconfig.h>
 #include <afs/param.h>
+#include <roken.h>
+
 #include <afs/stds.h>
 #include <afs/com_err.h>
 

src/WINNT/afsd/fs_utils.c

@@ -7,7 +7,10 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
+#include <afsconfig.h>
 #include <afs/param.h>
+#include <roken.h>
+
 #include <afs/stds.h>
 
 #include <windows.h>

src/WINNT/afsd/msrpc.c

@@ -22,6 +22,10 @@
  * SOFTWARE.
  */
 
+#include <afsconfig.h>
+#include <afs/param.h>
+#include <roken.h>
+
 #include <malloc.h>
 #include "ms-wkssvc.h"
 #include "ms-srvsvc.h"

src/WINNT/afsd/rawops.c

@@ -7,6 +7,10 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
+#include <afsconfig.h>
+#include <afs/param.h>
+#include <roken.h>
+
 #include <osi.h>
 #include "afsd.h"
 

src/WINNT/afsd/rpc_srvsvc.c

@@ -22,6 +22,11 @@
  * SOFTWARE.
  */
 
+
+#include <afsconfig.h>
+#include <afs/param.h>
+#include <roken.h>
+
 #include<windows.h>
 #include <wchar.h>
 #define _CRT_RAND_S

src/WINNT/afsd/rpc_wkssvc.c

@@ -22,6 +22,11 @@
  * SOFTWARE.
  */
 
+
+#include <afsconfig.h>
+#include <afs/param.h>
+#include <roken.h>
+
 #include <windows.h>
 #include <lmcons.h>
 #include <stdlib.h>

src/WINNT/afsd/smb.c

@@ -7,7 +7,10 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
+#include <afsconfig.h>
 #include <afs/param.h>
+#include <roken.h>
+
 #include <afs/stds.h>
 
 #include <windows.h>

src/WINNT/afsd/smb3.c

@@ -7,7 +7,10 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
+#include <afsconfig.h>
 #include <afs/param.h>
+#include <roken.h>
+
 #include <afs/stds.h>
 
 #include <windows.h>

src/WINNT/afsd/smb_ioctl.c

@@ -7,7 +7,10 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
+#include <afsconfig.h>
 #include <afs/param.h>
+#include <roken.h>
+
 #include <afs/stds.h>
 
 #include <windows.h>

src/WINNT/afsd/smb_rpc.c

@@ -24,7 +24,10 @@
 
 #define SMB_RPC_IMPL
 
+#include <afsconfig.h>
 #include <afs/param.h>
+#include <roken.h>
+
 #include <afs/stds.h>
 
 #include <windows.h>

src/WINNT/afsd/symlink.c

@@ -7,7 +7,10 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
+#include <afsconfig.h>
 #include <afs/param.h>
+#include <roken.h>
+
 #include <afs/stds.h>
 #include <afs/com_err.h>
 #include <afs/afs_consts.h>

src/WINNT/afsreg/afssw.c

@@ -107,7 +107,7 @@ afssw_GetClientCellServDBDir(char **bufPP)   /* [out] data buffer */
         if (path[tlen-1] != '\\') {
             char * newPath = malloc(tlen+2);
             if (newPath) {
-                snprintf(newPath,tlen+2,"%s\\",path);
+                _snprintf(newPath,tlen+2,"%s\\",path);
                 free(path);
                 path = newPath;
             }

src/WINNT/afssvrcfg/admin_info_dlg.cpp

@@ -11,8 +11,10 @@
 #include <ws2tcpip.h>
 
 extern "C" {
+#include <afsconfig.h>
 #include <afs/param.h>
 #include <afs/stds.h>
+#include <roken.h>
 }
 
 

src/WINNT/afssvrcfg/afscfg.cpp

@@ -16,8 +16,10 @@
 #include <ws2tcpip.h>
 
 extern "C" {
+#include <afsconfig.h>
 #include <afs/param.h>
 #include <afs/stds.h>
+#include <roken.h>
 }
 
 #include "afscfg.h"

src/WINNT/afssvrcfg/backup_server_page.cpp

@@ -15,8 +15,10 @@
 #include <ws2tcpip.h>
 
 extern "C" {
+#include <afsconfig.h>
 #include <afs/param.h>
 #include <afs/stds.h>
+#include <roken.h>
 }
 
 #include "afscfg.h"

src/WINNT/afssvrcfg/cfg_utils.cpp

@@ -15,8 +15,10 @@
 #include <ws2tcpip.h>
 
 extern "C" {
+#include <afsconfig.h>
 #include <afs/param.h>
 #include <afs/stds.h>
+#include <roken.h>
 }
 
 #include "afscfg.h"

src/WINNT/afssvrcfg/config_server_page.cpp

@@ -15,8 +15,10 @@
 #include <ws2tcpip.h>
 
 extern "C" {
+#include <afsconfig.h>
 #include <afs/param.h>
 #include <afs/stds.h>
+#include <roken.h>
 }
 
 #include "afscfg.h"

src/WINNT/afssvrcfg/create_partition_dlg.cpp

@@ -15,8 +15,10 @@
 #include <ws2tcpip.h>
 
 extern "C" {
+#include <afsconfig.h>
 #include <afs/param.h>
 #include <afs/stds.h>
+#include <roken.h>
 }
 
 #include "afscfg.h"		// Main header for this application

src/WINNT/afssvrcfg/db_server_page.cpp

@@ -15,8 +15,10 @@
 #include <ws2tcpip.h>
 
 extern "C" {
+#include <afsconfig.h>
 #include <afs/param.h>
 #include <afs/stds.h>
+#include <roken.h>
 }
 
 #include "afscfg.h"

src/WINNT/afssvrcfg/file_server_page.cpp

@@ -15,8 +15,10 @@
 #include <ws2tcpip.h>
 
 extern "C" {
+#include <afsconfig.h>
 #include <afs/param.h>
 #include <afs/stds.h>
+#include <roken.h>
 }
 
 #include "afscfg.h"

src/WINNT/afssvrcfg/get_cur_config.cpp

@@ -15,8 +15,10 @@
 #include <ws2tcpip.h>
 
 extern "C" {
+#include <afsconfig.h>
 #include <afs/param.h>
 #include <afs/stds.h>
+#include <roken.h>
 }
 
 #include "afscfg.h"

src/WINNT/afssvrcfg/get_pw_dlg.cpp

@@ -15,8 +15,10 @@
 #include <ws2tcpip.h>
 
 extern "C" {
+#include <afsconfig.h>
 #include <afs/param.h>
 #include <afs/stds.h>
+#include <roken.h>
 }
 
 #include "afscfg.h"		// Main header for this application

src/WINNT/afssvrcfg/graphics.cpp

@@ -15,8 +15,10 @@
 #include <ws2tcpip.h>
 
 extern "C" {
+#include <afsconfig.h>
 #include <afs/param.h>
 #include <afs/stds.h>
+#include <roken.h>
 }
 
 #include "afscfg.h"

src/WINNT/afssvrcfg/info2_page.cpp

@@ -15,8 +15,10 @@
 #include <ws2tcpip.h>
 
 extern "C" {
+#include <afsconfig.h>
 #include <afs/param.h>
 #include <afs/stds.h>
+#include <roken.h>
 }
 
 #include "afscfg.h"

src/WINNT/afssvrcfg/info_page.cpp

@@ -15,8 +15,10 @@
 #include <ws2tcpip.h>
 
 extern "C" {
+#include <afsconfig.h>
 #include <afs/param.h>
 #include <afs/stds.h>
+#include <roken.h>
 }
 
 #include "afscfg.h"

src/WINNT/afssvrcfg/intro_page.cpp

@@ -15,8 +15,10 @@
 #include <ws2tcpip.h>
 
 extern "C" {
+#include <afsconfig.h>
 #include <afs/param.h>
 #include <afs/stds.h>
+#include <roken.h>
 }
 
 #include "afscfg.h"

src/WINNT/afssvrcfg/logfile.cpp

@@ -15,8 +15,10 @@
 #include <ws2tcpip.h>
 
 extern "C" {
+#include <afsconfig.h>
 #include <afs/param.h>
 #include <afs/stds.h>
+#include <roken.h>
 }
 
 extern "C" {

src/WINNT/afssvrcfg/partition_page.cpp

@@ -15,8 +15,10 @@
 #include <ws2tcpip.h>
 
 extern "C" {
+#include <afsconfig.h>
 #include <afs/param.h>
 #include <afs/stds.h>
+#include <roken.h>
 }
 
 #include "afscfg.h"

src/WINNT/afssvrcfg/partition_utils.cpp

@@ -15,8 +15,10 @@
 #include <ws2tcpip.h>
 
 extern "C" {
+#include <afsconfig.h>
 #include <afs/param.h>
 #include <afs/stds.h>
+#include <roken.h>
 }
 
 #include "afscfg.h"

src/WINNT/afssvrcfg/partitions_page.cpp

@@ -15,8 +15,10 @@
 #include <ws2tcpip.h>
 
 extern "C" {
+#include <afsconfig.h>
 #include <afs/param.h>
 #include <afs/stds.h>
+#include <roken.h>
 }
 
 #include "afscfg.h"

src/WINNT/afssvrcfg/replicatition_page.cpp

@@ -15,8 +15,10 @@
 #include <ws2tcpip.h>
 
 extern "C" {
+#include <afsconfig.h>
 #include <afs/param.h>
 #include <afs/stds.h>
+#include <roken.h>
 }
 
 #include "afscfg.h"

src/WINNT/afssvrcfg/root_afs_page.cpp

@@ -15,8 +15,10 @@
 #include <ws2tcpip.h>
 
 extern "C" {
+#include <afsconfig.h>
 #include <afs/param.h>
 #include <afs/stds.h>
+#include <roken.h>
 }
 
 #include "afscfg.h"

src/WINNT/afssvrcfg/salvage_dlg.cpp

@@ -15,8 +15,10 @@
 #include <ws2tcpip.h>
 
 extern "C" {
+#include <afsconfig.h>
 #include <afs/param.h>
 #include <afs/stds.h>
+#include <roken.h>
 }
 
 #include "afscfg.h"		// Main header for this application

src/WINNT/afssvrcfg/salvage_results_dlg.cpp

@@ -14,6 +14,12 @@
 #include <winsock2.h>
 #include <ws2tcpip.h>
 
+extern "C" {
+#include <afsconfig.h>
+#include <afs/param.h>
+#include <roken.h>
+}
+
 #include "afscfg.h"		// Main header for this application
 #include "resource.h"
 #include "salvage_results_dlg.h"

src/WINNT/afssvrcfg/services_page.cpp

@@ -15,8 +15,10 @@
 #include <ws2tcpip.h>
 
 extern "C" {
+#include <afsconfig.h>
 #include <afs/param.h>
 #include <afs/stds.h>
+#include <roken.h>
 }
 
 #include "afscfg.h"

src/WINNT/afssvrcfg/sys_control_page.cpp

@@ -15,8 +15,10 @@
 #include <ws2tcpip.h>
 
 extern "C" {
+#include <afsconfig.h>
 #include <afs/param.h>
 #include <afs/stds.h>
+#include <roken.h>
 }
 
 #include "afscfg.h"