From eb4bee410a7d9c098dac8cdfa9695ff77983fa87 Mon Sep 17 00:00:00 2001
From: Andrew Deason <adeason@sinenomine.net>
Date: Mon, 19 Dec 2011 17:11:31 -0500
Subject: [PATCH] Include afsconfig.h before anything else

afsconfig.h can define various preprocessor symbols that can affect
how system headers behave. For example, the presence of the
_POSIX_PTHREAD_SEMANTICS symbol changes the number of arguments to
getpwnam_r on at least Solaris 8. So, we must include afsconfig.h
before including anything else, to ensure consistency.

FIXES 130413

Reviewed-on: http://gerrit.openafs.org/6387
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@secure-endpoints.com>
(cherry picked from commit 37f537a21db6d560dd16a53ff5e0d2f0456d4c48)

Change-Id: I64970fd06af9a13d91acaf03b80a2baf224754ff
Reviewed-on: http://gerrit.openafs.org/6388
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@secure-endpoints.com>
---
 src/afs/afsincludes.h             | 4 ++--
 src/afsmonitor/afsmon-output.c    | 6 +++---
 src/afsmonitor/afsmon-parselog.c  | 2 +-
 src/aklog/aklog.h                 | 3 ++-
 src/auth/test/ktctest.c           | 6 +++---
 src/bucoord/dump_sched.c          | 6 +++---
 src/bucoord/server.c              | 2 +-
 src/butc/test_budb.c              | 5 ++---
 src/config/mc.c                   | 3 ++-
 src/des/cbc_encrypt.c             | 2 +-
 src/des/des.c                     | 4 ++--
 src/des/new_rnd_key.c             | 4 ++--
 src/des/pcbc_encrypt.c            | 5 +++--
 src/des/strng_to_key.c            | 2 +-
 src/des/test/testit.c             | 6 +++---
 src/des/test/verify.c             | 6 +++---
 src/kauth/ka_util.c               | 6 +++---
 src/kauth/test/test_date.c        | 2 +-
 src/kauth/test/test_interim_ktc.c | 5 +++--
 src/kopenafs/kopenafs.c           | 5 +++--
 src/lwp/test/selclient.c          | 7 +++----
 src/lwp/test/selserver.c          | 7 +++----
 src/lwp/test/selsubs.c            | 7 +++----
 src/mcas/gc.c                     | 5 +++--
 src/pam/afs_message.c             | 5 +++--
 src/pam/afs_password.c            | 5 +++--
 src/pam/afs_setcred.c             | 5 +++--
 src/pam/afs_util.c                | 5 +++--
 src/ptserver/pt_util.c            | 5 +++--
 src/rx/test/kctest.c              | 2 +-
 src/rx/test/kstest.c              | 2 +-
 src/sys/icreate.c                 | 7 +++----
 src/uss/uss.c                     | 3 ++-
 src/util/secutil_nt.c             | 2 +-
 src/venus/cacheout.c              | 4 ++--
 src/vol/common.c                  | 5 +++--
 src/vol/devname.c                 | 2 +-
 37 files changed, 85 insertions(+), 77 deletions(-)

diff --git a/src/afs/afsincludes.h b/src/afs/afsincludes.h
index 1ad83aab0..18bcfda88 100644
--- a/src/afs/afsincludes.h
+++ b/src/afs/afsincludes.h
@@ -11,12 +11,12 @@
 #define AFS_INCLUDES_H 1
 
 
+#include <afsconfig.h>
+
 #ifdef UKERNEL
 #include <UKERNEL/afsincludes.h>
 #else
 
-#include <afsconfig.h>
-
 /* AFS based headers */
 #include "afs/stds.h"
 #ifdef	AFS_AIX_ENV
diff --git a/src/afsmonitor/afsmon-output.c b/src/afsmonitor/afsmon-output.c
index 67ed97aea..b7a20f788 100644
--- a/src/afsmonitor/afsmon-output.c
+++ b/src/afsmonitor/afsmon-output.c
@@ -15,12 +15,12 @@
  *
  *-------------------------------------------------------------------------*/
 
-#include <stdio.h>
-#include <time.h>
 #include <afsconfig.h>
 #include <afs/param.h>
-#include <string.h>
 
+#include <stdio.h>
+#include <time.h>
+#include <string.h>
 
 #include <afs/xstat_fs.h>
 #include <afs/xstat_cm.h>
diff --git a/src/afsmonitor/afsmon-parselog.c b/src/afsmonitor/afsmon-parselog.c
index e9b99d51c..80151416e 100644
--- a/src/afsmonitor/afsmon-parselog.c
+++ b/src/afsmonitor/afsmon-parselog.c
@@ -17,10 +17,10 @@
  *
  *-------------------------------------------------------------------------*/
 
-#include <stdio.h>
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <stdio.h>
 
 #include <afs/xstat_fs.h>
 #include <afs/xstat_cm.h>
diff --git a/src/aklog/aklog.h b/src/aklog/aklog.h
index 3cb7a4014..8bfc967a1 100644
--- a/src/aklog/aklog.h
+++ b/src/aklog/aklog.h
@@ -8,9 +8,10 @@
 #ifndef __AKLOG_H__
 #define __AKLOG_H__
 
+#include <afsconfig.h>
+
 #include <krb5.h>
 #include "linked_list.h"
-#include <afsconfig.h>
 
 #ifdef __STDC__
 #define ARGS(x) x
diff --git a/src/auth/test/ktctest.c b/src/auth/test/ktctest.c
index 72c461a61..0b0bba41c 100644
--- a/src/auth/test/ktctest.c
+++ b/src/auth/test/ktctest.c
@@ -9,14 +9,14 @@
 
 /* Test of the ktc_*Token() routines */
 
+#include <afsconfig.h>
+#include <afs/param.h>
+
 #include <stdlib.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <errno.h>
 
-#include <afsconfig.h>
-#include <afs/param.h>
-
 
 #include <afs/stds.h>
 #include <afs/afsutil.h>
diff --git a/src/bucoord/dump_sched.c b/src/bucoord/dump_sched.c
index 05e8983dd..0ba989fd3 100644
--- a/src/bucoord/dump_sched.c
+++ b/src/bucoord/dump_sched.c
@@ -11,12 +11,12 @@
  * ALL RIGHTS RESERVED
  */
 
-#include <sys/types.h>
-#include <stdio.h>
-#include <string.h>
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <sys/types.h>
+#include <stdio.h>
+#include <string.h>
 
 #ifdef AFS_NT40_ENV
 #include <winsock2.h>
diff --git a/src/bucoord/server.c b/src/bucoord/server.c
index 1f61dbe0f..b3773a394 100644
--- a/src/bucoord/server.c
+++ b/src/bucoord/server.c
@@ -7,10 +7,10 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-#include <sys/types.h>
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <sys/types.h>
 
 #ifdef AFS_NT40_ENV
 #include <winsock2.h>
diff --git a/src/butc/test_budb.c b/src/butc/test_budb.c
index ce86a5db4..e6460072e 100644
--- a/src/butc/test_budb.c
+++ b/src/butc/test_budb.c
@@ -7,12 +7,11 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-#include <sys/types.h>
-#include <netinet/in.h>
-
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <sys/types.h>
+#include <netinet/in.h>
 
 #include <afs/budb_client.h>
 #include <afs/budb.h>
diff --git a/src/config/mc.c b/src/config/mc.c
index 18d2efcad..b457e7dcd 100644
--- a/src/config/mc.c
+++ b/src/config/mc.c
@@ -7,6 +7,8 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
+#include "afsconfig.h"
+
 #define	MAXLINELEN	1024
 #define	MAXTOKLEN	100
 #include <sys/param.h>
@@ -15,7 +17,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "afsconfig.h"
 #include <string.h>
 
 #define TOK_DONTUSE 1		/* Don't copy if match and this flag is set. */
diff --git a/src/des/cbc_encrypt.c b/src/des/cbc_encrypt.c
index 1f0d11a58..54ac8a8e3 100644
--- a/src/des/cbc_encrypt.c
+++ b/src/des/cbc_encrypt.c
@@ -17,9 +17,9 @@
  * Originally written 8/85 by Steve Miller, MIT Project Athena.
  */
 
-#include "mit-cpyright.h"
 #include <afsconfig.h>
 #include <afs/param.h>
+#include "mit-cpyright.h"
 
 #ifndef KERNEL
 #include <stdio.h>
diff --git a/src/des/des.c b/src/des/des.c
index 1072d9db2..c6dfe5896 100644
--- a/src/des/des.c
+++ b/src/des/des.c
@@ -31,11 +31,11 @@
  *
  * originally written by Steve Miller, MIT Project Athena
  */
-#include "mit-cpyright.h"
-
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include "mit-cpyright.h"
+
 
 #ifndef KERNEL
 #include <stdio.h>
diff --git a/src/des/new_rnd_key.c b/src/des/new_rnd_key.c
index d91a255eb..4e986c18e 100644
--- a/src/des/new_rnd_key.c
+++ b/src/des/new_rnd_key.c
@@ -13,11 +13,11 @@
  * without license from the U.S. Commerce department.
  */
 
-#include "mit-cpyright.h"
-
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include "mit-cpyright.h"
+
 
 #ifndef KERNEL
 #include <stdio.h>
diff --git a/src/des/pcbc_encrypt.c b/src/des/pcbc_encrypt.c
index 563dd7de8..0021ea07a 100644
--- a/src/des/pcbc_encrypt.c
+++ b/src/des/pcbc_encrypt.c
@@ -20,13 +20,14 @@
  * spm 8/85	MIT project athena
  */
 
+#include <afsconfig.h>
+#include <afs/param.h>
+
 #include "mit-cpyright.h"
 #ifndef KERNEL
 #include <stdio.h>
 #include <string.h>
 #endif
-#include <afsconfig.h>
-#include <afs/param.h>
 #include "des.h"
 #include "des_prototypes.h"
 
diff --git a/src/des/strng_to_key.c b/src/des/strng_to_key.c
index 61507494b..ed667e5fe 100644
--- a/src/des/strng_to_key.c
+++ b/src/des/strng_to_key.c
@@ -20,10 +20,10 @@
  *	spm	8/85	MIT project athena
  */
 
-#include "mit-cpyright.h"
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include "mit-cpyright.h"
 
 #ifndef KERNEL
 #include <stdio.h>
diff --git a/src/des/test/testit.c b/src/des/test/testit.c
index 3579cba34..81eb76ea6 100644
--- a/src/des/test/testit.c
+++ b/src/des/test/testit.c
@@ -8,13 +8,13 @@
  *		-1 ==> error
  */
 
+#include <afsconfig.h>
+#include <afs/param.h>
+
 #include <mit-cpyright.h>
 #include <stdio.h>
 #include <errno.h>
 #include <des.h>
-#include <afsconfig.h>
-#include <afs/param.h>
-
 
 
 #define MIN_ARGC	0	/* min # args, not incl flags */
diff --git a/src/des/test/verify.c b/src/des/test/verify.c
index 1212341e4..6bb249694 100644
--- a/src/des/test/verify.c
+++ b/src/des/test/verify.c
@@ -11,13 +11,13 @@
  * 		-1 ==> error
  */
 
+#include <afsconfig.h>
+#include <afs/param.h>
+
 #include <mit-cpyright.h>
 #include <stdio.h>
 #include <errno.h>
 #include <des.h>
-#include <afsconfig.h>
-#include <afs/param.h>
-
 
 
 extern char *errmsg();
diff --git a/src/kauth/ka_util.c b/src/kauth/ka_util.c
index e7e4acf9e..896e6f08e 100644
--- a/src/kauth/ka_util.c
+++ b/src/kauth/ka_util.c
@@ -9,6 +9,9 @@
  *		     output of this program to be valid.
  */
 
+#include <afsconfig.h>
+#include <afs/param.h>
+
 #include <sys/types.h>
 #include <sys/time.h>
 #include <stdio.h>
@@ -16,9 +19,6 @@
 #include <string.h>
 #include <sys/file.h>
 
-#include <afsconfig.h>
-#include <afs/param.h>
-
 
 #include <lock.h>
 #include <netinet/in.h>
diff --git a/src/kauth/test/test_date.c b/src/kauth/test/test_date.c
index 56b9c5687..2466a265a 100644
--- a/src/kauth/test/test_date.c
+++ b/src/kauth/test/test_date.c
@@ -13,8 +13,8 @@
  * specifies the terms and conditions for redistribution.
  */
 
-#include <sys/param.h>
 #include <afsconfig.h>
+#include <sys/param.h>
 
 
 #include <stdio.h>
diff --git a/src/kauth/test/test_interim_ktc.c b/src/kauth/test/test_interim_ktc.c
index 76bd60ec0..bd3f4cb4a 100644
--- a/src/kauth/test/test_interim_ktc.c
+++ b/src/kauth/test/test_interim_ktc.c
@@ -9,14 +9,15 @@
 
 /* Test ktc related calls as well as some file access stuff. */
 
+#include <afsconfig.h>
+#include <afs/param.h>
+
 #include <sys/types.h>
 #include <errno.h>
 #include <stdio.h>
 #include <sys/file.h>
 #include <arpa/inet.h>
 #include <afs/prs_fs.h>
-#include <afsconfig.h>
-#include <afs/param.h>
 
 
 #include <afs/stds.h>
diff --git a/src/kopenafs/kopenafs.c b/src/kopenafs/kopenafs.c
index 9d987a6f4..dde7b6bca 100644
--- a/src/kopenafs/kopenafs.c
+++ b/src/kopenafs/kopenafs.c
@@ -12,6 +12,9 @@
  * included in the libsys code.
  */
 
+#include <afsconfig.h>
+#include <afs/param.h>
+
 #include <errno.h>
 #include <sys/types.h>
 #include <netinet/in.h>
@@ -26,9 +29,7 @@
 #include <sys/param.h>
 #include <unistd.h>
 
-#include <afsconfig.h>
 #include <afs/afssyscalls.h>
-#include <afs/param.h>
 #include <kopenafs.h>
 
 static volatile sig_atomic_t syscall_okay = 1;
diff --git a/src/lwp/test/selclient.c b/src/lwp/test/selclient.c
index 5222702b5..12d1f877f 100644
--- a/src/lwp/test/selclient.c
+++ b/src/lwp/test/selclient.c
@@ -34,6 +34,9 @@
  * on IRIX 6.2 and 6.4.
  */
 
+#include <afsconfig.h>
+#include <afs/param.h>
+
 #include <unistd.h>
 #include <stdio.h>
 #include <stdarg.h>
@@ -50,10 +53,6 @@
 #include <assert.h>
 #include <time.h>
 
-#include <afsconfig.h>
-#include <afs/param.h>
-
-
 
 #include "lwp.h"
 #include "seltest.h"
diff --git a/src/lwp/test/selserver.c b/src/lwp/test/selserver.c
index 454012475..f1b6c858f 100644
--- a/src/lwp/test/selserver.c
+++ b/src/lwp/test/selserver.c
@@ -34,6 +34,9 @@
  * on IRIX 6.2 and 6.4.
  */
 
+#include <afsconfig.h>
+#include <afs/param.h>
+
 #include <unistd.h>
 #include <stdarg.h>
 #include <stdio.h>
@@ -51,10 +54,6 @@
 #include <assert.h>
 #include <sys/stat.h>
 
-#include <afsconfig.h>
-#include <afs/param.h>
-
-
 
 #include "lwp.h"
 #include "seltest.h"
diff --git a/src/lwp/test/selsubs.c b/src/lwp/test/selsubs.c
index 0304c8b4a..1c893837b 100644
--- a/src/lwp/test/selsubs.c
+++ b/src/lwp/test/selsubs.c
@@ -8,6 +8,9 @@
  */
 
 /* selsubs.c - common code for client and server. */
+#include <afsconfig.h>
+#include <afs/param.h>
+
 #include <unistd.h>
 #include <stdarg.h>
 #include <stdio.h>
@@ -25,10 +28,6 @@
 #include <assert.h>
 #include <sys/stat.h>
 
-#include <afsconfig.h>
-#include <afs/param.h>
-
-
 
 #include "lwp.h"
 #include "seltest.h"
diff --git a/src/mcas/gc.c b/src/mcas/gc.c
index 369dd5c5b..53812c483 100644
--- a/src/mcas/gc.c
+++ b/src/mcas/gc.c
@@ -34,6 +34,9 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <afsconfig.h>
+#include <afs/param.h>
+
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -43,8 +46,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "portable_defns.h"
 #include "gc.h"
 
-#include <afsconfig.h>
-#include <afs/param.h>
 #include <afs/afsutil.h>
 
 /*#define MINIMAL_GC*/
diff --git a/src/pam/afs_message.c b/src/pam/afs_message.c
index 51cf826d0..1af9869d4 100644
--- a/src/pam/afs_message.c
+++ b/src/pam/afs_message.c
@@ -7,13 +7,14 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
+#include <afsconfig.h>
+#include <afs/param.h>
+
 #include <syslog.h>
 #include <stdlib.h>
 #include <string.h>
 #include <pwd.h>
 #include <unistd.h>
-#include <afsconfig.h>
-#include <afs/param.h>
 
 
 #include <security/pam_appl.h>
diff --git a/src/pam/afs_password.c b/src/pam/afs_password.c
index 1fca34805..9be379858 100644
--- a/src/pam/afs_password.c
+++ b/src/pam/afs_password.c
@@ -7,13 +7,14 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
+#include <afsconfig.h>
+#include <afs/param.h>
+
 #include <syslog.h>
 #include <stdlib.h>
 #include <string.h>
 #include <pwd.h>
 #include <unistd.h>
-#include <afsconfig.h>
-#include <afs/param.h>
 
 #include <security/pam_appl.h>
 #include <security/pam_modules.h>
diff --git a/src/pam/afs_setcred.c b/src/pam/afs_setcred.c
index 1bc22290e..2d051207b 100644
--- a/src/pam/afs_setcred.c
+++ b/src/pam/afs_setcred.c
@@ -7,14 +7,15 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
+#include <afsconfig.h>
+#include <afs/param.h>
+
 #include <syslog.h>
 #include <stdlib.h>
 #include <string.h>
 #include <pwd.h>
 #include <unistd.h>
 #include <errno.h>
-#include <afsconfig.h>
-#include <afs/param.h>
 
 #include <security/pam_appl.h>
 #include <security/pam_modules.h>
diff --git a/src/pam/afs_util.c b/src/pam/afs_util.c
index c9d1a6f49..9e6de7a0f 100644
--- a/src/pam/afs_util.c
+++ b/src/pam/afs_util.c
@@ -7,14 +7,15 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
+#include <afsconfig.h>
+#include <afs/param.h>
+
 #include <stdio.h>
 #include <assert.h>
 #include <unistd.h>
 #include <errno.h>
 #include <syslog.h>
 #include <security/pam_appl.h>
-#include <afsconfig.h>
-#include <afs/param.h>
 #include <sys/wait.h>
 #include <limits.h>
 #include <string.h>
diff --git a/src/ptserver/pt_util.c b/src/ptserver/pt_util.c
index c0a89aef9..16dc72344 100644
--- a/src/ptserver/pt_util.c
+++ b/src/ptserver/pt_util.c
@@ -11,6 +11,9 @@
  *		     output of this program to be valid.
  */
 
+#include <afsconfig.h>
+#include <afs/param.h>
+
 #include <sys/types.h>
 #ifndef _WIN32
 #include <sys/time.h>
@@ -25,8 +28,6 @@
 #include <string.h>
 #include <errno.h>
 
-#include <afsconfig.h>
-#include <afs/param.h>
 #include <afs/com_err.h>
 
 
diff --git a/src/rx/test/kctest.c b/src/rx/test/kctest.c
index b363aac5c..d9697692d 100644
--- a/src/rx/test/kctest.c
+++ b/src/rx/test/kctest.c
@@ -7,8 +7,8 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-#include "afs/param.h"
 #include <afsconfig.h>
+#include "afs/param.h"
 
 
 #include <sys/types.h>
diff --git a/src/rx/test/kstest.c b/src/rx/test/kstest.c
index 510912765..9c68d7157 100644
--- a/src/rx/test/kstest.c
+++ b/src/rx/test/kstest.c
@@ -7,8 +7,8 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-#include "afs/param.h"
 #include <afsconfig.h>
+#include "afs/param.h"
 
 
 #include <sys/types.h>
diff --git a/src/sys/icreate.c b/src/sys/icreate.c
index 455c1612e..e4c75e4de 100644
--- a/src/sys/icreate.c
+++ b/src/sys/icreate.c
@@ -7,14 +7,13 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
+#include <afsconfig.h>
+#include <afs/param.h>
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/file.h>
 #include <stdio.h>
-#include <afsconfig.h>
-#include <afs/param.h>
-
-
 
 #include "AFS_component_version_number.c"
 
diff --git a/src/uss/uss.c b/src/uss/uss.c
index b1bfee0fa..f5517150c 100644
--- a/src/uss/uss.c
+++ b/src/uss/uss.c
@@ -14,10 +14,11 @@
 /*
  * --------------------- Required definitions ---------------------
  */
-#include <stdlib.h>
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <stdlib.h>
+
 
 #ifdef	AFS_AIX32_ENV
 #include <signal.h>
diff --git a/src/util/secutil_nt.c b/src/util/secutil_nt.c
index 127cd943e..9132b5f49 100644
--- a/src/util/secutil_nt.c
+++ b/src/util/secutil_nt.c
@@ -9,8 +9,8 @@
 
 /* Security related utilities for the Windows platform */
 
-#include <afs/param.h>
 #include <afsconfig.h>
+#include <afs/param.h>
 
 
 #include <afs/stds.h>
diff --git a/src/venus/cacheout.c b/src/venus/cacheout.c
index 5fbd058fc..e49ddd6a9 100644
--- a/src/venus/cacheout.c
+++ b/src/venus/cacheout.c
@@ -7,11 +7,11 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-#include <afs/vldbint.h>
-
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <afs/vldbint.h>
+
 
 #include <stdio.h>
 #include <string.h>
diff --git a/src/vol/common.c b/src/vol/common.c
index 0e483772d..f520deafc 100644
--- a/src/vol/common.c
+++ b/src/vol/common.c
@@ -14,11 +14,12 @@
 
  */
 
+#include <afsconfig.h>
+#include <afs/param.h>
+
 #include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <afsconfig.h>
-#include <afs/param.h>
 
 
 #include <afs/afsutil.h>
diff --git a/src/vol/devname.c b/src/vol/devname.c
index fae960c83..743d1b836 100644
--- a/src/vol/devname.c
+++ b/src/vol/devname.c
@@ -7,8 +7,8 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-#include <sys/param.h>
 #include <afsconfig.h>
+#include <sys/param.h>
 
 
 #include <afs/param.h>
-- 
2.39.5