- (dtucker) [roaming_common.c roaming_dummy.c] Wrap #include <inttypes.h> in

   ifdef.

diff --git a/ChangeLog b/ChangeLog
index 5635d7aa0461573859807aadb8695b9b50a8ba63..c801521bc7ae350851618a2f4575c5c9917843c2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -108,6 +108,8 @@
  - (dtucker) [auth2-jpake.c auth2.c canohost.h session.c] Whitespace and
    header-order changes to reduce diff vs OpenBSD.
  - (dtucker) [servconf.c sshd.c] More whitespace sync.
+ - (dtucker) [roaming_common.c roaming_dummy.c] Wrap #include <inttypes.h> in
+   ifdef.
 
 20090616
  - (dtucker) [configure.ac defines.h] Bug #1607: handle the case where fsid_t

diff --git a/roaming_common.c b/roaming_common.c
index 065542520c618ef02a7fa26f25391d40ea69c098..14dd5808f6e2447f6e4bdccc9a22e263cfff3956 100644 (file)
--- a/roaming_common.c
+++ b/roaming_common.c
@@ -15,12 +15,16 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include "includes.h"
+
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/uio.h>
 
 #include <errno.h>
+#ifdef HAVE_INTTYPES_H
 #include <inttypes.h>
+#endif
 #include <stdarg.h>
 #include <unistd.h>
 

diff --git a/roaming_dummy.c b/roaming_dummy.c
index f081bffe94ff4795017ac3b45a7579079e515230..45c4008e7f9b9ff6f91606d701178cc90735c621 100644 (file)
--- a/roaming_dummy.c
+++ b/roaming_dummy.c
@@ -20,6 +20,8 @@
  * support roaming.
  */
 
+#include "includes.h"
+
 #include <sys/types.h>
 #include <unistd.h>