summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2019-10-09 09:06:35 +1100
committerDamien Miller <djm@mindrot.org>2019-10-09 09:06:35 +1100
commitcfc1897a2002ec6c4dc879b24e8b3153c87ea2cf (patch)
treeebeec2716f65dbb23cf0db174b2b82833c0b8fc2
parent13b3369830a43b89a503915216a23816d1b25744 (diff)
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
-rw-r--r--channels.c2
-rw-r--r--monitor.c2
-rw-r--r--scp.c2
-rw-r--r--ssh-keygen.c4
-rw-r--r--sshbuf-getput-basic.c4
-rw-r--r--sshbuf-misc.c2
-rw-r--r--xmalloc.c2
-rw-r--r--xmss_commons.c2
-rw-r--r--xmss_fast.c2
-rw-r--r--xmss_hash.c2
-rw-r--r--xmss_hash_address.c2
-rw-r--r--xmss_wots.c2
12 files changed, 16 insertions, 12 deletions
diff --git a/channels.c b/channels.c
index 47521d3e..0f45aee4 100644
--- 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 96d10913..5076a74f 100644
--- 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 84a76d0b..0348d067 100644
--- 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 85fb4424..8c829cad 100644
--- 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 ffa20a02..d401a726 100644
--- 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 65987e25..a73f008b 100644
--- 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 dc22757b..9cd0127d 100644
--- 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 59486aea..8d6b80b6 100644
--- 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 e37447f6..421b39a3 100644
--- 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 b9eee7cf..50a57794 100644
--- 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 c6c1347e..2702c456 100644
--- 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 ed904cd7..993e661f 100644
--- 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"