From: Jeffrey Altman <jaltman@your-file-system.com>
Date: Mon, 14 Jun 2010 18:13:11 +0000 (-0400)
Subject: Windows: ensure that afsconfig.h and afs/param.h are included
X-Git-Tag: openafs-devel-1_5_75~122
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=9316f209eda47362d7b96464b1fff4bd5b086da7;p=packages%2Fo%2Fopenafs.git

Windows: ensure that afsconfig.h and afs/param.h are included

The recent addition of AFS_NORETURN broke the Windows build
because afsconfig.h and afs/param.h were not included everywhere.
Make sure that they are.

Change-Id: I5962fe1178f73273f5b3c1d269b1a125fba2d2c6
Reviewed-on: http://gerrit.openafs.org/2159
Tested-by: Jeffrey Altman <jaltman@openafs.org>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
---

diff --git a/src/WINNT/afsd/afsd.h b/src/WINNT/afsd/afsd.h
index bed826953..f1efa735d 100644
--- a/src/WINNT/afsd/afsd.h
+++ b/src/WINNT/afsd/afsd.h
@@ -12,6 +12,7 @@
 
 #define USE_BPLUS 1
 
+#include <afsconfig.h>
 #include <afs/param.h>
 
 BOOL InitClass(HANDLE);
diff --git a/src/WINNT/afsd/cm_btree.c b/src/WINNT/afsd/cm_btree.c
index a9329a471..a12c4d66e 100644
--- a/src/WINNT/afsd/cm_btree.c
+++ b/src/WINNT/afsd/cm_btree.c
@@ -13,8 +13,8 @@
 #include <windows.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <assert.h>
 #include "afsd.h"
+#include <assert.h>
 #include <strsafe.h>
 
 #ifdef USE_BPLUS
diff --git a/src/WINNT/netidmgr_plugin/krb5common.c b/src/WINNT/netidmgr_plugin/krb5common.c
index 4b97a69b3..7fbaa9eef 100644
--- a/src/WINNT/netidmgr_plugin/krb5common.c
+++ b/src/WINNT/netidmgr_plugin/krb5common.c
@@ -24,6 +24,9 @@
 
 /* $Id$ */
 
+#include <afsconfig.h>
+#include <afs/param.h>
+
 #include<windows.h>
 #include<netidmgr.h>
 #include<dynimport.h>
diff --git a/src/config/mkvers.c b/src/config/mkvers.c
index c0227966a..a82014d97 100644
--- a/src/config/mkvers.c
+++ b/src/config/mkvers.c
@@ -12,6 +12,9 @@
  *
  */
 
+#include <afsconfig.h>
+#include <afs/param.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/types.h>
diff --git a/src/config/util_cr.c b/src/config/util_cr.c
index 2dc0f5f56..4f918fd13 100644
--- a/src/config/util_cr.c
+++ b/src/config/util_cr.c
@@ -9,6 +9,9 @@
 
 */
 
+#include <afsconfig.h>
+#include <afs/param.h>
+
 #undef _CRTDBG_MAP_ALLOC
 #include "stdio.h"
 #include "io.h"
diff --git a/src/ptserver/utils.c b/src/ptserver/utils.c
index 91a7e1535..6ec4ce50c 100644
--- a/src/ptserver/utils.c
+++ b/src/ptserver/utils.c
@@ -7,11 +7,10 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-#include <assert.h>
 #include <afsconfig.h>
 #include <afs/param.h>
 
-
+#include <assert.h>
 #include <sys/types.h>
 #include <lock.h>
 #include <ubik.h>