wrap stdint.h include in HAVE_STDINT_H

make the indenting a little more consistent too..

Fixes Solaris 2.6; reported by Tom G. Christensen

diff --git a/channels.c b/channels.c
index 47521d3e7e72cf611ebd9496efa9a734c7fcee3d..0f45aee4eb5fc5544620e8534c16f526386b7e52 100644 (file)
--- a/channels.c
+++ b/channels.c
@@ -59,7 +59,7 @@
 #include <netdb.h>
 #include <stdarg.h>
 #ifdef HAVE_STDINT_H
- #include <stdint.h>
+# include <stdint.h>
 #endif
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/monitor.c b/monitor.c
index 96d10913c61b366c7b6172080bc37fbfa8db2292..5076a74ff0a777d60379392557ebc026b36b127e 100644 (file)
--- a/monitor.c
+++ b/monitor.c
@@ -40,7 +40,7 @@
 #include <pwd.h>
 #include <signal.h>
 #ifdef HAVE_STDINT_H
-#include <stdint.h>
+# include <stdint.h>
 #endif
 #include <stdlib.h>
 #include <string.h>

diff --git a/scp.c b/scp.c
index 84a76d0b8d39f9fd4b3d0deb703e9176ec38c0f9..0348d0673bff0d91737b3d8c9f13f3f130ab9453 100644 (file)
--- a/scp.c
+++ b/scp.c
@@ -101,7 +101,7 @@
 #include <signal.h>
 #include <stdarg.h>
 #ifdef HAVE_STDINT_H
-#include <stdint.h>
+# include <stdint.h>
 #endif
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/ssh-keygen.c b/ssh-keygen.c
index 85fb4424fbb4e87f9b26d4394298fd6478933061..8c829cad6004829cf23bfee4c1076d54c696cdbf 100644 (file)
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -24,7 +24,9 @@
 #include "openbsd-compat/openssl-compat.h"
 #endif
 
-#include <stdint.h>
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
 #include <errno.h>
 #include <fcntl.h>
 #include <netdb.h>

diff --git a/sshbuf-getput-basic.c b/sshbuf-getput-basic.c
index ffa20a02cb7c9a516a1653841d41877b5900c0d2..d401a72653a654ec34e97ca9f0d8f76b559d5fdb 100644 (file)
--- a/sshbuf-getput-basic.c
+++ b/sshbuf-getput-basic.c
@@ -24,7 +24,9 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <stdint.h>
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
 
 #include "ssherr.h"
 #include "sshbuf.h"

diff --git a/sshbuf-misc.c b/sshbuf-misc.c
index 65987e2518024247a33831c04931dd58298d7514..a73f008b0c82af8bf1f88fbd17d1abd346d97149 100644 (file)
--- a/sshbuf-misc.c
+++ b/sshbuf-misc.c
@@ -23,7 +23,7 @@
 #include <errno.h>
 #include <stdlib.h>
 #ifdef HAVE_STDINT_H
-#include <stdint.h>
+# include <stdint.h>
 #endif
 #include <stdio.h>
 #include <limits.h>

diff --git a/xmalloc.c b/xmalloc.c
index dc22757b01dabd2f2e6cbf5c329b7a0d9b7d1b25..9cd0127dd3c7c90ad73584203dadf0554716627c 100644 (file)
--- a/xmalloc.c
+++ b/xmalloc.c
@@ -17,7 +17,7 @@
 
 #include <stdarg.h>
 #ifdef HAVE_STDINT_H
-#include <stdint.h>
+# include <stdint.h>
 #endif
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/xmss_commons.c b/xmss_commons.c
index 59486aead70803f10c988f5cd5f2842b88012007..8d6b80b6eb799cf124ab097d2c9523339d43e630 100644 (file)
--- a/xmss_commons.c
+++ b/xmss_commons.c
@@ -13,7 +13,7 @@ Public domain.
 #include <stdlib.h>
 #include <stdio.h>
 #ifdef HAVE_STDINT_H
-#include <stdint.h>
+# include <stdint.h>
 #endif
 
 void to_byte(unsigned char *out, unsigned long long in, uint32_t bytes)

diff --git a/xmss_fast.c b/xmss_fast.c
index e37447f60d8c4007a095321a1535389c4664f035..421b39a37a9e4a8071989d3dafe90a95eab71982 100644 (file)
--- a/xmss_fast.c
+++ b/xmss_fast.c
@@ -12,7 +12,7 @@ Public domain.
 #include <stdlib.h>
 #include <string.h>
 #ifdef HAVE_STDINT_H
-#include <stdint.h>
+# include <stdint.h>
 #endif
 
 #include "xmss_fast.h"

diff --git a/xmss_hash.c b/xmss_hash.c
index b9eee7cff293f7d21c6a226eda054ed19b7bae24..50a577943974e0a0c2b74c49eb21979f2ea9f405 100644 (file)
--- a/xmss_hash.c
+++ b/xmss_hash.c
@@ -15,7 +15,7 @@ Public domain.
 
 #include <stddef.h>
 #ifdef HAVE_STDINT_H
-#include <stdint.h>
+# include <stdint.h>
 #endif
 #include <stdio.h>
 #include <string.h>

diff --git a/xmss_hash_address.c b/xmss_hash_address.c
index c6c1347e9267f88749981626cef651d63aa38899..2702c4562bfcf2b14f5d848bfb3c69d53bc3cdac 100644 (file)
--- a/xmss_hash_address.c
+++ b/xmss_hash_address.c
@@ -9,7 +9,7 @@ Public domain.
 #ifdef WITH_XMSS
 
 #ifdef HAVE_STDINT_H
-#include <stdint.h>
+# include <stdint.h>
 #endif
 #include "xmss_hash_address.h" /* prototypes */
 

diff --git a/xmss_wots.c b/xmss_wots.c
index ed904cd754ddbeb5207980c42019ca6eab61fbbf..993e661f67079fe73054c039061231c21b329607 100644 (file)
--- a/xmss_wots.c
+++ b/xmss_wots.c
@@ -11,7 +11,7 @@ Public domain.
 
 #include <stdlib.h>
 #ifdef HAVE_STDINT_H
-#include <stdint.h>
+# include <stdint.h>
 #endif
 #include <limits.h>
 #include "xmss_commons.h"