From 3ab948769cae172d1bf16cb870f0ff2e7627bae6 Mon Sep 17 00:00:00 2001
From: Jeffrey Altman <jaltman@your-file-system.com>
Date: Wed, 12 May 2010 11:27:17 -0400
Subject: [PATCH] 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>
---
 src/WINNT/netidmgr_plugin/afsconfigdlg.c | 4 ----
 src/WINNT/netidmgr_plugin/afscred.h      | 1 +
 src/WINNT/netidmgr_plugin/afsext.c       | 4 ----
 src/WINNT/netidmgr_plugin/afsfuncs.c     | 5 -----
 src/WINNT/netidmgr_plugin/afshelp.c      | 5 -----
 src/WINNT/netidmgr_plugin/afsicon.c      | 4 ----
 src/WINNT/netidmgr_plugin/afsnewcreds.c  | 4 ----
 src/WINNT/netidmgr_plugin/afsplugin.c    | 4 ----
 src/WINNT/netidmgr_plugin/main.c         | 5 -----
 9 files changed, 1 insertion(+), 35 deletions(-)

diff --git a/src/WINNT/netidmgr_plugin/afsconfigdlg.c b/src/WINNT/netidmgr_plugin/afsconfigdlg.c
index 93f4c2f05..bcc82c108 100644
--- 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 caf036e8e..f4d75f1b2 100644
--- 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 d9a41d329..2e07c3135 100644
--- 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 1b4e6d9cd..93f8df3a4 100644
--- 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 316ea4855..30a7cc619 100644
--- 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 bb0e18277..54cb6dd85 100644
--- 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 01dc909d3..e079550bf 100644
--- 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 8a697b3b4..89cb2b4f5 100644
--- 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 2cd96f07a..916459034 100644
--- 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>
-- 
2.39.5