Windows: netidmgr_plugin move roken.h to afscred.h

Due to historical issues with the MIT KFW headers
the netidmgr plugin must define _USE_32BIT_TIME_T
which alters the size of time_t in all C RTL data
structures that include it.   roken.h must be included
after this definition in order for it to do the right
thing in conjunction with the MIT KFW headers.  This
means that an exception to the rule that roken.h must
be one of the first three files included in every
source file in the tree must exist for this directory.
In the netidmgr_plugin directory, afscred.h includes
roken.h and afscred.h is the first header included
in all other files.

Change-Id: I11214e5eaac0144aaf04c3a21bb92d521d75c6e1
Reviewed-on: http://gerrit.openafs.org/3616
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
Tested-by: Jeffrey Altman <jaltman@openafs.org>

diff --git a/src/WINNT/netidmgr_plugin/afsconfigdlg.c b/src/WINNT/netidmgr_plugin/afsconfigdlg.c
index 93f4c2f05fe4e5bff43d00268aca1b744406641e..bcc82c108bf62991c66c9ce2e2508a99fc731c80 100644 (file)
--- a/src/WINNT/netidmgr_plugin/afsconfigdlg.c
+++ b/src/WINNT/netidmgr_plugin/afsconfigdlg.c
@@ -24,10 +24,6 @@
 
 /* $Id$ */
 
-#include <afsconfig.h>
-#include <afs/param.h>
-#include <roken.h>
-
 #include<afscred.h>
 #include<kherror.h>
 #include<khuidefs.h>

diff --git a/src/WINNT/netidmgr_plugin/afscred.h b/src/WINNT/netidmgr_plugin/afscred.h
index caf036e8ea3077a466a1e4600d32bd8eaa90bcb4..f4d75f1b2267f022ff22c8abab328619b087b664 100644 (file)
--- a/src/WINNT/netidmgr_plugin/afscred.h
+++ b/src/WINNT/netidmgr_plugin/afscred.h
@@ -33,6 +33,7 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <roken.h>
 
 #define _WINSOCKAPI_
 #include<windows.h>

diff --git a/src/WINNT/netidmgr_plugin/afsext.c b/src/WINNT/netidmgr_plugin/afsext.c
index d9a41d329852c2e3054eb2785068c248fbbb7482..2e07c313548ac02e32c7658f0c1a50aea3ba386b 100644 (file)
--- a/src/WINNT/netidmgr_plugin/afsext.c
+++ b/src/WINNT/netidmgr_plugin/afsext.c
@@ -24,10 +24,6 @@
 
 /* $Id$ */
 
-#include <afsconfig.h>
-#include <afs/param.h>
-#include <roken.h>
-
 #include<afscred.h>
 #include<assert.h>
 #include<wchar.h>

diff --git a/src/WINNT/netidmgr_plugin/afsfuncs.c b/src/WINNT/netidmgr_plugin/afsfuncs.c
index 1b4e6d9cdb80fd6b44bc45ec8f9c692bd990bcd0..93f8df3a42e7cff853866a18a342a41494174de1 100644 (file)
--- a/src/WINNT/netidmgr_plugin/afsfuncs.c
+++ b/src/WINNT/netidmgr_plugin/afsfuncs.c
@@ -29,11 +29,6 @@
 #pragma warning (push)
 #pragma warning (disable: 4005)
 
-
-#include <afsconfig.h>
-#include <afs/param.h>
-#include <roken.h>
-
 #include<afscred.h>
 #include<dynimport.h>
 #include<krb5common.h>

diff --git a/src/WINNT/netidmgr_plugin/afshelp.c b/src/WINNT/netidmgr_plugin/afshelp.c
index 316ea4855695cbaa4653dda32cf891c1fb807c81..30a7cc619554acdd09ac38ec2bef9d735934e752 100644 (file)
--- a/src/WINNT/netidmgr_plugin/afshelp.c
+++ b/src/WINNT/netidmgr_plugin/afshelp.c
@@ -26,11 +26,6 @@
 
 #define NOSTRSAFE
 
-
-#include <afsconfig.h>
-#include <afs/param.h>
-#include <roken.h>
-
 #include<afscred.h>
 #include<shlwapi.h>
 #include<htmlhelp.h>

diff --git a/src/WINNT/netidmgr_plugin/afsicon.c b/src/WINNT/netidmgr_plugin/afsicon.c
index bb0e18277f7fdd6b52f572cf311e1fba11d27eee..54cb6dd85a90d91e0efd963d73c471f206ae27f9 100644 (file)
--- a/src/WINNT/netidmgr_plugin/afsicon.c
+++ b/src/WINNT/netidmgr_plugin/afsicon.c
@@ -1,8 +1,4 @@
 
-#include <afsconfig.h>
-#include <afs/param.h>
-#include <roken.h>
-
 #define NOSTRSAFE
 #include "afscred.h"
 #include "AFS_component_version_number.h"

diff --git a/src/WINNT/netidmgr_plugin/afsnewcreds.c b/src/WINNT/netidmgr_plugin/afsnewcreds.c
index 01dc909d39694d33cf17759a009b0a6b74f904d9..e079550bf81907cd49cd68069cb37cb88ea45878 100644 (file)
--- a/src/WINNT/netidmgr_plugin/afsnewcreds.c
+++ b/src/WINNT/netidmgr_plugin/afsnewcreds.c
@@ -24,10 +24,6 @@
 
 /* $Id$ */
 
-#include <afsconfig.h>
-#include <afs/param.h>
-#include <roken.h>
-
 #include<afscred.h>
 #include<commctrl.h>
 #include<assert.h>

diff --git a/src/WINNT/netidmgr_plugin/afsplugin.c b/src/WINNT/netidmgr_plugin/afsplugin.c
index 8a697b3b4487e6ee7294fd08827462a1680be719..89cb2b4f5788b9f67d7cd37c2a7700f75fa96104 100644 (file)
--- a/src/WINNT/netidmgr_plugin/afsplugin.c
+++ b/src/WINNT/netidmgr_plugin/afsplugin.c
@@ -24,10 +24,6 @@
 
 /* $Id$ */
 
-#include <afsconfig.h>
-#include <afs/param.h>
-#include <roken.h>
-
 #include<afscred.h>
 #include<kcreddb.h>
 #include<khmsgtypes.h>

diff --git a/src/WINNT/netidmgr_plugin/main.c b/src/WINNT/netidmgr_plugin/main.c
index 2cd96f07ac5c90b3e2fba322c72717944836fe18..9164590345792dcfd1fbcbf6e1a1a18b724d7c15 100644 (file)
--- a/src/WINNT/netidmgr_plugin/main.c
+++ b/src/WINNT/netidmgr_plugin/main.c
@@ -29,11 +29,6 @@
 #pragma warning (push)
 #pragma warning (disable: 4005)
 
-
-#include <afsconfig.h>
-#include <afs/param.h>
-#include <roken.h>
-
 #include<afscred.h>
 #include<kmm.h>
 #include<dynimport.h>