From 1e53da39f57777792eb9431a6c553db3e1f6b96c Mon Sep 17 00:00:00 2001
From: Andrew Deason <adeason@sinenomine.net>
Date: Wed, 17 Feb 2010 12:56:51 -0600
Subject: [PATCH] Include stdint.h when using intptr_t

Some platforms such as OpenBSD require including stdint.h before you can
use intptr_t. So, include stdint.h (if it is available) whenever we use
intptr_t.

Change-Id: I6da005755752e8d52f62e78d15103b19a951e50a
Reviewed-on: http://gerrit.openafs.org/1336
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
---
 src/afsd/vsys.c             | 3 +++
 src/afsmonitor/afsmonitor.c | 3 +++
 src/bozo/bnode.c            | 3 +++
 src/bozo/bosoprocs.c        | 3 +++
 src/bucoord/dump.c          | 3 +++
 src/budb/dbs_dump.c         | 3 +++
 src/butc/dump.c             | 3 +++
 src/butc/lwps.c             | 3 +++
 src/butc/recoverDb.c        | 3 +++
 src/butc/tcprocs.c          | 3 +++
 src/butc/tcudbprocs.c       | 3 +++
 src/butm/file_tm.c          | 3 +++
 src/dir/salvage.c           | 4 ++++
 src/kauth/authclient.c      | 3 +++
 src/rx/rx.c                 | 3 +++
 src/rx/rx_pthread.c         | 3 +++
 src/rxkad/rxkad_server.c    | 3 +++
 src/scout/scout.c           | 3 +++
 src/ubik/ubikclient.c       | 3 +++
 src/usd/usd_file.c          | 4 ++++
 src/util/serverLog.c        | 3 +++
 src/viced/viced.c           | 3 +++
 src/vlserver/vlserver.c     | 3 +++
 src/vol/fssync-server.c     | 3 +++
 src/vol/vnode.c             | 4 ++++
 src/volser/volmain.c        | 3 +++
 src/volser/vos.c            | 3 +++
 27 files changed, 84 insertions(+)

diff --git a/src/afsd/vsys.c b/src/afsd/vsys.c
index 0dd4a89..b1df7eb 100644
--- a/src/afsd/vsys.c
+++ b/src/afsd/vsys.c
@@ -16,6 +16,9 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
 
 
 #include <afs/afs_args.h>
diff --git a/src/afsmonitor/afsmonitor.c b/src/afsmonitor/afsmonitor.c
index 848c44d..08e3b4e 100644
--- a/src/afsmonitor/afsmonitor.c
+++ b/src/afsmonitor/afsmonitor.c
@@ -31,6 +31,9 @@
 #include <sys/socket.h>
 #include <netdb.h>
 #include <ctype.h>
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
 
 #include <afs/gtxwindows.h>		/*Generic window package */
 #include <afs/gtxobjects.h>		/*Object definitions */
diff --git a/src/bozo/bnode.c b/src/bozo/bnode.c
index bd28b02..38ad7c2 100644
--- a/src/bozo/bnode.c
+++ b/src/bozo/bnode.c
@@ -17,6 +17,9 @@
 #include <dirent.h>
 #include <errno.h>
 #include <sys/types.h>
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
 #ifdef AFS_NT40_ENV
 #include <io.h>
 #else
diff --git a/src/bozo/bosoprocs.c b/src/bozo/bosoprocs.c
index 90e9350..96f82e8 100644
--- a/src/bozo/bosoprocs.c
+++ b/src/bozo/bosoprocs.c
@@ -31,6 +31,9 @@
 #include <des.h>
 #include <dirent.h>
 #include <stdio.h>
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
 #include <afs/afsutil.h>
 #include <afs/fileutil.h>
 #include <afs/ktime.h>
diff --git a/src/bucoord/dump.c b/src/bucoord/dump.c
index 7747866..c27424b 100644
--- a/src/bucoord/dump.c
+++ b/src/bucoord/dump.c
@@ -17,6 +17,9 @@
 
 #include <sys/types.h>
 #include <afs/cmd.h>
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
 #ifdef AFS_NT40_ENV
 #include <winsock2.h>
 #else
diff --git a/src/budb/dbs_dump.c b/src/budb/dbs_dump.c
index 5ac93a8..9fad9ad 100644
--- a/src/budb/dbs_dump.c
+++ b/src/budb/dbs_dump.c
@@ -25,6 +25,9 @@
 #include <sys/types.h>
 #include <afs/stds.h>
 #include <stdio.h>
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
 #include <lock.h>
 #include <ubik.h>
 #include <lwp.h>
diff --git a/src/butc/dump.c b/src/butc/dump.c
index 0c1acc3..863270c 100644
--- a/src/butc/dump.c
+++ b/src/butc/dump.c
@@ -22,6 +22,9 @@
 #endif
 #include <stdlib.h>
 #include <string.h>
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
 #include <rx/xdr.h>
 #include <rx/rx.h>
 #include <lwp.h>
diff --git a/src/butc/lwps.c b/src/butc/lwps.c
index 0f1daf6..a111c7b 100644
--- a/src/butc/lwps.c
+++ b/src/butc/lwps.c
@@ -21,6 +21,9 @@
 #include <netinet/in.h>
 #include <netdb.h>
 #endif
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
 
 #include <afs/procmgmt.h>
 #include <rx/xdr.h>
diff --git a/src/butc/recoverDb.c b/src/butc/recoverDb.c
index 83e6e30..6274290 100644
--- a/src/butc/recoverDb.c
+++ b/src/butc/recoverDb.c
@@ -12,6 +12,9 @@
 
 
 #include <stdio.h>
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
 #ifdef AFS_NT40_ENV
 #include <winsock2.h>
 #else
diff --git a/src/butc/tcprocs.c b/src/butc/tcprocs.c
index de7d44d..0b1b6b7 100644
--- a/src/butc/tcprocs.c
+++ b/src/butc/tcprocs.c
@@ -15,6 +15,9 @@
 
 #include <sys/types.h>
 #include <errno.h>
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
 #ifdef AFS_NT40_ENV
 #include <winsock2.h>
 #else
diff --git a/src/butc/tcudbprocs.c b/src/butc/tcudbprocs.c
index b358194..234ca64 100644
--- a/src/butc/tcudbprocs.c
+++ b/src/butc/tcudbprocs.c
@@ -15,6 +15,9 @@
 #endif
 
 #include <sys/types.h>
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
 #ifdef AFS_NT40_ENV
 #include <winsock2.h>
 #include <io.h>
diff --git a/src/butm/file_tm.c b/src/butm/file_tm.c
index e4e02e8..333bd5a 100644
--- a/src/butm/file_tm.c
+++ b/src/butm/file_tm.c
@@ -24,6 +24,9 @@
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
 #include <lwp.h>
 #include <afs/com_err.h>
 #include <afs/butm.h>
diff --git a/src/dir/salvage.c b/src/dir/salvage.c
index 2b39245..ac85ae0 100644
--- a/src/dir/salvage.c
+++ b/src/dir/salvage.c
@@ -27,6 +27,10 @@
 
 #include <string.h>
 
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
+
 #include "dir.h"
 /* Defined in vol/vol-salvage.c */
 extern void Log(const char *format, ...);
diff --git a/src/kauth/authclient.c b/src/kauth/authclient.c
index 9257fa5..de499d3 100644
--- a/src/kauth/authclient.c
+++ b/src/kauth/authclient.c
@@ -51,6 +51,9 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #endif
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
 #include <string.h>
 #include <stdio.h>
 #include <des.h>
diff --git a/src/rx/rx.c b/src/rx/rx.c
index def5feb..33c422b 100755
--- a/src/rx/rx.c
+++ b/src/rx/rx.c
@@ -85,6 +85,9 @@ extern afs_int32 afs_termState;
 # include <string.h>
 # include <stdarg.h>
 # include <errno.h>
+# ifdef HAVE_STDINT_H
+#  include <stdint.h>
+# endif
 #ifdef AFS_NT40_ENV
 # include <stdlib.h>
 # include <fcntl.h>
diff --git a/src/rx/rx_pthread.c b/src/rx/rx_pthread.c
index 6496eef..cab61ec 100644
--- a/src/rx/rx_pthread.c
+++ b/src/rx/rx_pthread.c
@@ -23,6 +23,9 @@
 #include <errno.h>
 #include <signal.h>
 #include <string.h>
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
 #ifndef AFS_NT40_ENV
 # include <sys/socket.h>
 # include <sys/file.h>
diff --git a/src/rxkad/rxkad_server.c b/src/rxkad/rxkad_server.c
index 7638482..5b3e503 100644
--- a/src/rxkad/rxkad_server.c
+++ b/src/rxkad/rxkad_server.c
@@ -32,6 +32,9 @@
 #include <des.h>
 #include <afs/afsutil.h>
 #include <des/stats.h>
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
 #include "private_data.h"
 #define XPRT_RXKAD_SERVER
 
diff --git a/src/scout/scout.c b/src/scout/scout.c
index 676e66c..0d49b86 100644
--- a/src/scout/scout.c
+++ b/src/scout/scout.c
@@ -36,6 +36,9 @@
 #include <errno.h>
 #include <afs/afsutil.h>
 #include <netdb.h>
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
 
 /*
  * Command line parameter indicies.
diff --git a/src/ubik/ubikclient.c b/src/ubik/ubikclient.c
index 2f413bf..b185db7 100644
--- a/src/ubik/ubikclient.c
+++ b/src/ubik/ubikclient.c
@@ -49,6 +49,9 @@
 #include "ubik.h"
 #endif /* defined(UKERNEL) */
 
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
 
 short ubik_initializationState;	/*!< initial state is zero */
 
diff --git a/src/usd/usd_file.c b/src/usd/usd_file.c
index 0694c81..742cda1 100644
--- a/src/usd/usd_file.c
+++ b/src/usd/usd_file.c
@@ -34,6 +34,10 @@
 #include <string.h>
 #include <stdlib.h>
 
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
+
 #include <afs/debug.h>
 #include "usd.h"
 
diff --git a/src/util/serverLog.c b/src/util/serverLog.c
index 736528a..98e5eb0 100644
--- a/src/util/serverLog.c
+++ b/src/util/serverLog.c
@@ -40,6 +40,9 @@
 #include "afsutil.h"
 #include "fileutil.h"
 #include <lwp.h>
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
 #if defined(AFS_PTHREAD_ENV)
 #include <assert.h>
 #include <pthread.h>
diff --git a/src/viced/viced.c b/src/viced/viced.c
index c0245cf..4874a6f 100644
--- a/src/viced/viced.c
+++ b/src/viced/viced.c
@@ -30,6 +30,9 @@
 #include <afs/procmgmt.h>	/* signal(), kill(), wait(), etc. */
 #include <sys/stat.h>
 #include <fcntl.h>
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
 #ifdef AFS_NT40_ENV
 #include <io.h>
 #include <windows.h>
diff --git a/src/vlserver/vlserver.c b/src/vlserver/vlserver.c
index 25c6397..e96fcbb 100644
--- a/src/vlserver/vlserver.c
+++ b/src/vlserver/vlserver.c
@@ -34,6 +34,9 @@
 #include <netinet/in.h>
 #endif
 #include <stdio.h>
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
 
 #include <rx/xdr.h>
 #include <rx/rx.h>
diff --git a/src/vol/fssync-server.c b/src/vol/fssync-server.c
index 1d2f665..3f9578e 100644
--- a/src/vol/fssync-server.c
+++ b/src/vol/fssync-server.c
@@ -46,6 +46,9 @@
 
 #include <sys/types.h>
 #include <stdio.h>
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
 #ifdef AFS_NT40_ENV
 #include <winsock2.h>
 #include <time.h>
diff --git a/src/vol/vnode.c b/src/vol/vnode.c
index e200571..269800a 100644
--- a/src/vol/vnode.c
+++ b/src/vol/vnode.c
@@ -64,6 +64,10 @@
 #endif /* AFS_NT40_ENV */
 #include <sys/stat.h>
 
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
+
 /*@printflike@*/ extern void Log(const char *format, ...);
 
 /*@printflike@*/ extern void Abort(const char *format, ...);
diff --git a/src/volser/volmain.c b/src/volser/volmain.c
index 459550b..8827e71 100644
--- a/src/volser/volmain.c
+++ b/src/volser/volmain.c
@@ -13,6 +13,9 @@
 
 #include <sys/types.h>
 #include <string.h>
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
 #ifdef AFS_NT40_ENV
 #include <time.h>
 #include <fcntl.h>
diff --git a/src/volser/vos.c b/src/volser/vos.c
index 7e45ec8..ed9c58a 100644
--- a/src/volser/vos.c
+++ b/src/volser/vos.c
@@ -16,6 +16,9 @@
 
 #include <sys/types.h>
 #include <string.h>
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
 #ifdef AFS_NT40_ENV
 #include <fcntl.h>
 #include <io.h>
-- 
1.9.4