Fill in missing system header files.

Create replacement header files inside openbsd-compat for common headers
that are missing on a given platform.  Usually these are just empty,
but in some cases they'll include the equivalent file.  This avoids
having to wrap those includes in '#ifdef HAVE_FOO_H' and reduces the
diff vs OpenBSD.

If we create any such headers, add the path to includes.

Initially just stdint.h, more to follow.

ok djm@

diff --git a/auth-options.c b/auth-options.c
index c89b1ee58c7790d184c1668c8b9230d9607fc393..785a239903379827363c13922ddc0af3db64be95 100644 (file)
--- a/auth-options.c
+++ b/auth-options.c
@@ -24,9 +24,7 @@
 #include <pwd.h>
 #include <string.h>
 #include <stdio.h>
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
+#include <stdint.h>
 #include <stdarg.h>
 #include <ctype.h>
 #include <limits.h>

diff --git a/channels.c b/channels.c
index 67ee073879b5089a5081c5405dcb782ad98fe525..5dbf428aa1cd2896d032a1b35b50ccb421f19ac9 100644 (file)
--- a/channels.c
+++ b/channels.c
@@ -61,9 +61,7 @@
 #include <poll.h>
 #endif
 #include <stdarg.h>
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/configure.ac b/configure.ac
index 71766ba10e063a830e2e887b48cf9149383fa1ba..fffe2f407a72c2c486dafbfd08c15477eb4c1f4c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -489,7 +489,6 @@ AC_CHECK_HEADERS([ \
        sha2.h \
        shadow.h \
        stddef.h \
-       stdint.h \
        string.h \
        strings.h \
        sys/bitypes.h \
@@ -531,6 +530,22 @@ AC_CHECK_HEADERS([ \
        wchar.h \
 ])
 
+# Create replacement header files for common headers that are missing on this
+# platform.  Usually these are just empty, but in some cases they'll include
+# the equivalent file.  This avoids having to wrap those includes in
+# '#ifdef HAVE_FOO_H'.  If we create any such headers, add the path to includes.
+compatincludes=no
+AC_CHECK_HEADERS([stdint.h], [], [
+    compatincludes="`pwd`/openbsd-compat/include"
+    mkdir -p "$compatincludes"
+    case "$ac_header" in
+    *)      ;;
+    esac >"$compatincludes/$ac_header"
+])
+if test "$compatincludes" != "no"; then
+    CPPFLAGS="$CPPFLAGS -I$compatincludes"
+fi
+
 AC_CHECK_DECLS([le32toh, le64toh, htole64], [], [], [
 #ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>

diff --git a/crypto_api.h b/crypto_api.h
index 8bbc3a08aaebb6bf203bc0896fc4c15211ea887f..693b67bbc0e76c63ca61d5454812f900eb16e472 100644 (file)
--- a/crypto_api.h
+++ b/crypto_api.h
@@ -10,9 +10,7 @@
 
 #include "includes.h"
 
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
+#include <stdint.h>
 #include <stdlib.h>
 
 typedef int8_t crypto_int8;

diff --git a/kexmlkem768x25519.c b/kexmlkem768x25519.c
index 2b5d396082389c30d59e2d613b32e9ca7cf84776..7ade7a7f904f8ae1cec443b867d20eb0ebacd70a 100644 (file)
--- a/kexmlkem768x25519.c
+++ b/kexmlkem768x25519.c
@@ -28,9 +28,7 @@
 #include <sys/types.h>
 
 #include <stdio.h>
-#ifdef HAVE_STDINT_H
 #include <stdint.h>
-#endif
 #include <stdbool.h>
 #include <string.h>
 #include <signal.h>

diff --git a/misc.c b/misc.c
index 183332082b5a0991266a0b9225ebdf0d28c337a8..4e09f2b4b2eba36eccdb8fe95d9d7d7180245390 100644 (file)
--- a/misc.c
+++ b/misc.c
@@ -42,9 +42,7 @@
 #include <signal.h>
 #include <stdarg.h>
 #include <stdio.h>
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>

diff --git a/monitor.c b/monitor.c
index 129ff4ccb9c0bbec960ed683cb3c2e1bb4c3230c..d0a2b3f50f21955fbde6b0ad535e4c1ebeb86a78 100644 (file)
--- a/monitor.c
+++ b/monitor.c
@@ -39,9 +39,7 @@
 #endif
 #include <pwd.h>
 #include <signal.h>
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>

diff --git a/openbsd-compat/arc4random.c b/openbsd-compat/arc4random.c
index ffd33734db5647250745b06a6b0afa7f886055c5..376a893d21107bf924ddcf218c9a84acedb854da 100644 (file)
--- a/openbsd-compat/arc4random.c
+++ b/openbsd-compat/arc4random.c
@@ -32,9 +32,7 @@
 #include <fcntl.h>
 #include <limits.h>
 #include <signal.h>
-#ifdef HAVE_STDINT_H
 #include <stdint.h>
-#endif
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>

diff --git a/openbsd-compat/arc4random_uniform.c b/openbsd-compat/arc4random_uniform.c
index 591f92d150fafc1a980fc976c87f8dad2f24d91c..59d516884eb123929e257bd28bf85b1e2bf43352 100644 (file)
--- a/openbsd-compat/arc4random_uniform.c
+++ b/openbsd-compat/arc4random_uniform.c
@@ -20,9 +20,7 @@
 
 #include "includes.h"
 
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
+#include <stdint.h>
 #include <stdlib.h>
 
 #ifndef HAVE_ARC4RANDOM_UNIFORM

diff --git a/openbsd-compat/glob.c b/openbsd-compat/glob.c
index e89151789aa3e9c799ad35963a447a782e8ca9f9..330b9c0aa73a7251861a9a825ab49db3a5748e9d 100644 (file)
--- a/openbsd-compat/glob.c
+++ b/openbsd-compat/glob.c
@@ -70,9 +70,7 @@
 #include <limits.h>
 #include <pwd.h>
 #include <stdlib.h>
-#ifdef HAVE_STDINT_H
 #include <stdint.h>
-#endif
 #include <string.h>
 #include <unistd.h>
 

diff --git a/openbsd-compat/memmem.c b/openbsd-compat/memmem.c
index 2637401d7c6e3098fce7d8d611fb7702f181481c..afc20c669b087ea661f8bde98bf299e34149453d 100644 (file)
--- a/openbsd-compat/memmem.c
+++ b/openbsd-compat/memmem.c
@@ -30,9 +30,7 @@
 #ifndef HAVE_MEMMEM
 
 #include <string.h>
-#ifdef HAVE_STDINT_H
 #include <stdint.h>
-#endif
 
 static char *
 twobyte_memmem(const unsigned char *h, size_t k, const unsigned char *n)

diff --git a/openbsd-compat/reallocarray.c b/openbsd-compat/reallocarray.c
index 1a52acc623fecd3d5e9496d7daae720894bcf9f3..cffe9b5efe7b2be2c72a0bd512b5b71ce6dc052b 100644 (file)
--- a/openbsd-compat/reallocarray.c
+++ b/openbsd-compat/reallocarray.c
@@ -22,9 +22,7 @@
 
 #include <sys/types.h>
 #include <errno.h>
-#ifdef HAVE_STDINT_H
 #include <stdint.h>
-#endif
 #include <stdlib.h>
 
 /*

diff --git a/openbsd-compat/recallocarray.c b/openbsd-compat/recallocarray.c
index 3e1156ce2d95985b5cebef86b94043050034c525..c281f75e94d12ad1002a921c414d9efb90fb8140 100644 (file)
--- a/openbsd-compat/recallocarray.c
+++ b/openbsd-compat/recallocarray.c
@@ -22,9 +22,7 @@
 
 #include <errno.h>
 #include <stdlib.h>
-#ifdef HAVE_STDINT_H
 #include <stdint.h>
-#endif
 #include <string.h>
 #include <unistd.h>
 

diff --git a/poly1305.c b/poly1305.c
index de4d8877025d9db51a325f6fb440ea854128bc86..c6747161c97ff25455dfdbb58a08ada9a8d5bbdd 100644 (file)
--- a/poly1305.c
+++ b/poly1305.c
@@ -7,9 +7,7 @@
 #include "includes.h"
 
 #include <sys/types.h>
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
+#include <stdint.h>
 
 #include "poly1305.h"
 

diff --git a/regress/misc/sk-dummy/sk-dummy.c b/regress/misc/sk-dummy/sk-dummy.c
index afa0314da83841030356e768b91e2d9e77172d76..4c96e8827c50b0171d6b23bff0455d74a809e269 100644 (file)
--- a/regress/misc/sk-dummy/sk-dummy.c
+++ b/regress/misc/sk-dummy/sk-dummy.c
@@ -17,9 +17,7 @@
 
 #include "includes.h"
 
-#ifdef HAVE_STDINT_H
 #include <stdint.h>
-#endif
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>

diff --git a/regress/unittests/authopt/tests.c b/regress/unittests/authopt/tests.c
index 5285f0db5746c9c193e9c03d623146bb0b0744a4..a81dffbf7ba3aee5bc22c58df9902584d2f6878c 100644 (file)
--- a/regress/unittests/authopt/tests.c
+++ b/regress/unittests/authopt/tests.c
@@ -10,9 +10,7 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef HAVE_STDINT_H
 #include <stdint.h>
-#endif
 #include <stdlib.h>
 #include <string.h>
 

diff --git a/regress/unittests/bitmap/tests.c b/regress/unittests/bitmap/tests.c
index b8eae231321513101c98189f3c10bdce9a382bd8..6470f983d447678a66c31b216cd0c3345be39dfb 100644 (file)
--- a/regress/unittests/bitmap/tests.c
+++ b/regress/unittests/bitmap/tests.c
@@ -9,9 +9,7 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef HAVE_STDINT_H
 #include <stdint.h>
-#endif
 #include <stdlib.h>
 #include <string.h>
 

diff --git a/regress/unittests/conversion/tests.c b/regress/unittests/conversion/tests.c
index d65e6326fd4e1b434863a909a2d21c842e02f2d3..fce4d1ca70010a4c40afeb98d1f0090d4f5cfb18 100644 (file)
--- a/regress/unittests/conversion/tests.c
+++ b/regress/unittests/conversion/tests.c
@@ -9,9 +9,7 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef HAVE_STDINT_H
 #include <stdint.h>
-#endif
 #include <stdlib.h>
 #include <string.h>
 

diff --git a/regress/unittests/hostkeys/test_iterate.c b/regress/unittests/hostkeys/test_iterate.c
index 0139376f4a78e26bac883ff874c7bce0c8358198..65d6d1f4355750f46ea8bdc0030bbc71fbcd303c 100644 (file)
--- a/regress/unittests/hostkeys/test_iterate.c
+++ b/regress/unittests/hostkeys/test_iterate.c
@@ -9,9 +9,7 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef HAVE_STDINT_H
 #include <stdint.h>
-#endif
 #include <stdlib.h>
 #include <string.h>
 

diff --git a/regress/unittests/kex/test_kex.c b/regress/unittests/kex/test_kex.c
index 0c33e80f869d6f9207194cc497960ba4ae5c9aa0..16c2f2dff9755a7aede8ed102d5f91708460079a 100644 (file)
--- a/regress/unittests/kex/test_kex.c
+++ b/regress/unittests/kex/test_kex.c
@@ -10,9 +10,7 @@
 #include <sys/types.h>
 #include <sys/time.h>
 #include <stdio.h>
-#ifdef HAVE_STDINT_H
 #include <stdint.h>
-#endif
 #include <stdlib.h>
 #include <string.h>
 

diff --git a/regress/unittests/kex/test_proposal.c b/regress/unittests/kex/test_proposal.c
index fa4192bb661c440fb4acc9fa2a42d068b8a02c39..01bf7e589f40e91eb5b0dd8f5900fa26a2426e90 100644 (file)
--- a/regress/unittests/kex/test_proposal.c
+++ b/regress/unittests/kex/test_proposal.c
@@ -10,9 +10,7 @@
 #include <sys/types.h>
 #include <signal.h>
 #include <stdio.h>
-#ifdef HAVE_STDINT_H
 #include <stdint.h>
-#endif
 #include <stdlib.h>
 #include <string.h>
 

diff --git a/regress/unittests/match/tests.c b/regress/unittests/match/tests.c
index 2ca6c769ae3f4d73f550b4a2b03b83b39113c0d9..163a3a25569d4892e09135a212d7d875567b51f2 100644 (file)
--- a/regress/unittests/match/tests.c
+++ b/regress/unittests/match/tests.c
@@ -9,9 +9,7 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef HAVE_STDINT_H
 #include <stdint.h>
-#endif
 #include <stdlib.h>
 #include <string.h>
 

diff --git a/regress/unittests/misc/test_argv.c b/regress/unittests/misc/test_argv.c
index 682863e73ba91161ae5113e766c9359b90231ee1..a20a9e78fcc4a69a537263cc3c849d2abfd919c4 100644 (file)
--- a/regress/unittests/misc/test_argv.c
+++ b/regress/unittests/misc/test_argv.c
@@ -9,9 +9,7 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef HAVE_STDINT_H
 #include <stdint.h>
-#endif
 #include <stdlib.h>
 #include <string.h>
 

diff --git a/regress/unittests/misc/test_convtime.c b/regress/unittests/misc/test_convtime.c
index 4794dbd9daae4de45645c8607e9785cc6a08c290..4fdcf38127df0bf203ed4dbd4f295b67cce7aff0 100644 (file)
--- a/regress/unittests/misc/test_convtime.c
+++ b/regress/unittests/misc/test_convtime.c
@@ -10,9 +10,7 @@
 #include <sys/types.h>
 #include <limits.h>
 #include <stdio.h>
-#ifdef HAVE_STDINT_H
 #include <stdint.h>
-#endif
 #include <stdlib.h>
 #include <string.h>
 

diff --git a/regress/unittests/misc/test_expand.c b/regress/unittests/misc/test_expand.c
index 6f2cd8adbedd342185ea95da03513b5b072984dd..b72a1e9a84243257aa917272d6e9587cf6a2692a 100644 (file)
--- a/regress/unittests/misc/test_expand.c
+++ b/regress/unittests/misc/test_expand.c
@@ -9,9 +9,7 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef HAVE_STDINT_H
 #include <stdint.h>
-#endif
 #include <stdlib.h>
 #include <string.h>
 

diff --git a/regress/unittests/misc/test_hpdelim.c b/regress/unittests/misc/test_hpdelim.c
index d423023dc3d2d9b41ecc40f1c30653d6f15e455c..626f1856444d93dab5b28436f82f75b4f32aa253 100644 (file)
--- a/regress/unittests/misc/test_hpdelim.c
+++ b/regress/unittests/misc/test_hpdelim.c
@@ -9,9 +9,7 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef HAVE_STDINT_H
 #include <stdint.h>
-#endif
 #include <stdlib.h>
 #include <string.h>
 

diff --git a/regress/unittests/misc/test_parse.c b/regress/unittests/misc/test_parse.c
index c66028aec5e6fd21e6a9ef3d0d27de57b8a1feab..cbffbe0fdb9f973bd77092ce8e7b865e229f06b1 100644 (file)
--- a/regress/unittests/misc/test_parse.c
+++ b/regress/unittests/misc/test_parse.c
@@ -9,9 +9,7 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef HAVE_STDINT_H
 #include <stdint.h>
-#endif
 #include <stdlib.h>
 #include <string.h>
 

diff --git a/regress/unittests/misc/test_ptimeout.c b/regress/unittests/misc/test_ptimeout.c
index cc58ee8547c3f76c1067db92abb2a7cda21beedf..359a460cc81bac613642d9cf94ee075211ea2dfe 100644 (file)
--- a/regress/unittests/misc/test_ptimeout.c
+++ b/regress/unittests/misc/test_ptimeout.c
@@ -9,9 +9,7 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #ifdef HAVE_POLL_H

diff --git a/regress/unittests/misc/test_strdelim.c b/regress/unittests/misc/test_strdelim.c
index f7bea4bfe8f7a54c9d5d1bc75534899ab4c91ebd..ae0f71556d07aa4ff003fe0b8277dfcc5a97a064 100644 (file)
--- a/regress/unittests/misc/test_strdelim.c
+++ b/regress/unittests/misc/test_strdelim.c
@@ -9,9 +9,7 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef HAVE_STDINT_H
 #include <stdint.h>
-#endif
 #include <stdlib.h>
 #include <string.h>
 

diff --git a/regress/unittests/misc/test_xextendf.c b/regress/unittests/misc/test_xextendf.c
index 133633dc6224c017e84373b70396ea54989c992d..3c1ee8b8b65c6f53f1415f366597cb2dd590b43f 100644 (file)
--- a/regress/unittests/misc/test_xextendf.c
+++ b/regress/unittests/misc/test_xextendf.c
@@ -9,9 +9,7 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef HAVE_STDINT_H
 #include <stdint.h>
-#endif
 #include <stdlib.h>
 #include <string.h>
 

diff --git a/regress/unittests/misc/tests.c b/regress/unittests/misc/tests.c
index 578bc1d90fa59880428c4bd1ca56b037f70c717e..a71dde727a5b6e119fc76806e6d9dc3fcc0bc518 100644 (file)
--- a/regress/unittests/misc/tests.c
+++ b/regress/unittests/misc/tests.c
@@ -9,9 +9,7 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef HAVE_STDINT_H
 #include <stdint.h>
-#endif
 #include <stdlib.h>
 #include <string.h>
 

diff --git a/regress/unittests/sshbuf/test_sshbuf.c b/regress/unittests/sshbuf/test_sshbuf.c
index e22b390fe33d795cca65cae1697881367e9e4b80..dc021ba9087bac22efc543090529c3319e90c543 100644 (file)
--- a/regress/unittests/sshbuf/test_sshbuf.c
+++ b/regress/unittests/sshbuf/test_sshbuf.c
@@ -10,9 +10,7 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 

diff --git a/regress/unittests/sshbuf/test_sshbuf_fixed.c b/regress/unittests/sshbuf/test_sshbuf_fixed.c
index dff77f0421527997688fdc5540c135db6b458bc1..cc05025a82afd9ebba6a23c91a151660d8048704 100644 (file)
--- a/regress/unittests/sshbuf/test_sshbuf_fixed.c
+++ b/regress/unittests/sshbuf/test_sshbuf_fixed.c
@@ -10,9 +10,7 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 

diff --git a/regress/unittests/sshbuf/test_sshbuf_fuzz.c b/regress/unittests/sshbuf/test_sshbuf_fuzz.c
index c0b809dcde1b183385638772019bd1d14659e886..51838ee724ddea901a53c129e1457360ad44da88 100644 (file)
--- a/regress/unittests/sshbuf/test_sshbuf_fuzz.c
+++ b/regress/unittests/sshbuf/test_sshbuf_fuzz.c
@@ -9,9 +9,7 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 

diff --git a/regress/unittests/sshbuf/test_sshbuf_getput_basic.c b/regress/unittests/sshbuf/test_sshbuf_getput_basic.c
index b5aca1fb1f9c932138fe19f051bcb9249bd32bb7..058bf17d474b33d9d2f7c9559a1bfc4ee2d81379 100644 (file)
--- a/regress/unittests/sshbuf/test_sshbuf_getput_basic.c
+++ b/regress/unittests/sshbuf/test_sshbuf_getput_basic.c
@@ -9,9 +9,7 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 

diff --git a/regress/unittests/sshbuf/test_sshbuf_getput_crypto.c b/regress/unittests/sshbuf/test_sshbuf_getput_crypto.c
index 46a96fdadb38a6700cf66e8a25f9911e451d56fd..97ee853d8875cbe9d9bfef4f7933c4b860020448 100644 (file)
--- a/regress/unittests/sshbuf/test_sshbuf_getput_crypto.c
+++ b/regress/unittests/sshbuf/test_sshbuf_getput_crypto.c
@@ -11,9 +11,7 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 

diff --git a/regress/unittests/sshbuf/test_sshbuf_getput_fuzz.c b/regress/unittests/sshbuf/test_sshbuf_getput_fuzz.c
index 3b4895895ef1c52c3021401ca23ce19f49c0b952..aa345c773a0cab09e52fd723dc14c46919c7a8f3 100644 (file)
--- a/regress/unittests/sshbuf/test_sshbuf_getput_fuzz.c
+++ b/regress/unittests/sshbuf/test_sshbuf_getput_fuzz.c
@@ -9,9 +9,7 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 

diff --git a/regress/unittests/sshbuf/test_sshbuf_misc.c b/regress/unittests/sshbuf/test_sshbuf_misc.c
index 80081c519f2a89504c4f5810f5fcb1c6f1603dbd..58f55eee89ae33d611ff789fc89d4e12c510cde9 100644 (file)
--- a/regress/unittests/sshbuf/test_sshbuf_misc.c
+++ b/regress/unittests/sshbuf/test_sshbuf_misc.c
@@ -9,9 +9,7 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 

diff --git a/regress/unittests/sshkey/common.c b/regress/unittests/sshkey/common.c
index edb1d95fa794e5acc6c15895c8b221746034892d..fa68e6d5b3ff326294b4e7f81a291f6c0f9714f8 100644 (file)
--- a/regress/unittests/sshkey/common.c
+++ b/regress/unittests/sshkey/common.c
@@ -11,9 +11,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <stdio.h>
-#ifdef HAVE_STDINT_H
 #include <stdint.h>
-#endif
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>

diff --git a/regress/unittests/sshkey/test_file.c b/regress/unittests/sshkey/test_file.c
index 49148aca07b2927b839fcec8cb63700c1c2bd697..e412b75d83215bbb46a68191de0eef2c27a4a7db 100644 (file)
--- a/regress/unittests/sshkey/test_file.c
+++ b/regress/unittests/sshkey/test_file.c
@@ -11,9 +11,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <stdio.h>
-#ifdef HAVE_STDINT_H
 #include <stdint.h>
-#endif
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>

diff --git a/regress/unittests/sshkey/test_fuzz.c b/regress/unittests/sshkey/test_fuzz.c
index 12d0e12eacefde0235f5490b3594c2909e764dcf..d0f47d7cfd1dfe36a3f8e47c039f86f4c313bd5a 100644 (file)
--- a/regress/unittests/sshkey/test_fuzz.c
+++ b/regress/unittests/sshkey/test_fuzz.c
@@ -11,9 +11,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <stdio.h>
-#ifdef HAVE_STDINT_H
 #include <stdint.h>
-#endif
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>

diff --git a/regress/unittests/sshkey/test_sshkey.c b/regress/unittests/sshkey/test_sshkey.c
index 9dbd913066a81671253f040037c20d98885414d4..5d5a6bec38433bf7365a714abe10f87171b9876a 100644 (file)
--- a/regress/unittests/sshkey/test_sshkey.c
+++ b/regress/unittests/sshkey/test_sshkey.c
@@ -9,9 +9,7 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#ifdef HAVE_STDINT_H
 #include <stdint.h>
-#endif
 #include <stdlib.h>
 #include <string.h>
 

diff --git a/regress/unittests/sshsig/tests.c b/regress/unittests/sshsig/tests.c
index ef1a46edcbb2c93ba3f7472a17d7326133957fdf..670d0671895512084ea765ac6a43df73489af8d9 100644 (file)
--- a/regress/unittests/sshsig/tests.c
+++ b/regress/unittests/sshsig/tests.c
@@ -11,9 +11,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <stdio.h>
-#ifdef HAVE_STDINT_H
 #include <stdint.h>
-#endif
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>

diff --git a/regress/unittests/test_helper/fuzz.c b/regress/unittests/test_helper/fuzz.c
index edad5e1f5197705f6c86c580d5ccd5e6cd657c11..c2711c72841f4f45f823fd7a7180d08d5e5d5a2a 100644 (file)
--- a/regress/unittests/test_helper/fuzz.c
+++ b/regress/unittests/test_helper/fuzz.c
@@ -25,9 +25,7 @@
 #include <assert.h>
 #include <ctype.h>
 #include <stdio.h>
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <signal.h>

diff --git a/regress/unittests/test_helper/test_helper.c b/regress/unittests/test_helper/test_helper.c
index 7783d65a4f4ac7c1fcf20e09813ad17d7afe1a07..51b80119bafa60be51d0e362b1af65d40264b191 100644 (file)
--- a/regress/unittests/test_helper/test_helper.c
+++ b/regress/unittests/test_helper/test_helper.c
@@ -29,9 +29,7 @@
 #include <math.h>
 #include <signal.h>
 #include <stdarg.h>
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/regress/unittests/test_helper/test_helper.h b/regress/unittests/test_helper/test_helper.h
index 23338af38882bb3073bedcabe1cc14a56e990d29..4f7e2c87f28d2f696d3df84c336a05d1e5b50ebd 100644 (file)
--- a/regress/unittests/test_helper/test_helper.h
+++ b/regress/unittests/test_helper/test_helper.h
@@ -23,9 +23,7 @@
 #include "includes.h"
 
 #include <sys/types.h>
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
+#include <stdint.h>
 
 #ifdef WITH_OPENSSL
 #include <openssl/bn.h>

diff --git a/scp.c b/scp.c
index 3cdbb7bd8283936ad8e8e42717353bbe2774f2f0..f7328e5b3baa801556712d8b0f89eb53a519bfd8 100644 (file)
--- a/scp.c
+++ b/scp.c
@@ -113,9 +113,7 @@
 #include <pwd.h>
 #include <signal.h>
 #include <stdarg.h>
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/sk-api.h b/sk-api.h
index 08f567a9e271340ab3b6c39177d042ff1b9789ec..32d0f118b9b162aef352b733d5b7fff9bbe45a74 100644 (file)
--- a/sk-api.h
+++ b/sk-api.h
@@ -19,9 +19,7 @@
 #define _SK_API_H 1
 
 #include <stddef.h>
-#ifdef HAVE_STDINT_H
 #include <stdint.h>
-#endif
 
 /* Flags */
 #define SSH_SK_USER_PRESENCE_REQD      0x01

diff --git a/sk-usbhid.c b/sk-usbhid.c
index c18c40df2db6f6ee4e5016b01dc5a745af2fae98..cd248811a51ce8449bbefc9a0073d8fc3445d1ab 100644 (file)
--- a/sk-usbhid.c
+++ b/sk-usbhid.c
@@ -20,9 +20,7 @@
 
 #ifdef ENABLE_SK_INTERNAL
 
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>

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

diff --git a/ssh-sk.c b/ssh-sk.c
index a2a7d7206cc70a946c9d55f1bd2cf91fdf8105cf..6bb1edc90b8099f849c236d46b349706e1d6b7c9 100644 (file)
--- a/ssh-sk.c
+++ b/ssh-sk.c
@@ -23,9 +23,7 @@
 
 #include <dlfcn.h>
 #include <stddef.h>
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
+#include <stdint.h>
 #include <string.h>
 #include <stdio.h>
 

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

diff --git a/sshbuf-misc.c b/sshbuf-misc.c
index 431809d906df0da3699e648d3774e8113cea7449..7b11e4e1760b86b3ba451f5423a811c55120716c 100644 (file)
--- a/sshbuf-misc.c
+++ b/sshbuf-misc.c
@@ -22,9 +22,7 @@
 #include <netinet/in.h>
 #include <errno.h>
 #include <stdlib.h>
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
+#include <stdint.h>
 #include <stdio.h>
 #include <limits.h>
 #include <string.h>

diff --git a/umac.c b/umac.c
index 94c5e817c76df24edb7abf734423f449fb173db0..078434b8de042a75f81eecaf8693bd98cffd35c6 100644 (file)
--- a/umac.c
+++ b/umac.c
@@ -76,9 +76,7 @@
 #include <string.h>
 #include <stdarg.h>
 #include <stdio.h>
-#ifdef HAVE_STDINT_H
 #include <stdint.h>
-#endif
 #include <stdlib.h>
 #include <stddef.h>
 

diff --git a/xmalloc.c b/xmalloc.c
index bf1da4b89456c91dafb8352e2f17f34b5fee884a..a058f085c148f8fcbdf21706a8598c33dbdaf749 100644 (file)
--- a/xmalloc.c
+++ b/xmalloc.c
@@ -16,9 +16,7 @@
 #include "includes.h"
 
 #include <stdarg.h>
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>