Prefer the stdint types if available

This is similar to the change we did in libogg some time back,
it means the generated header is less likely to vary unnecessarily
between system architectures.

1 files changed, 10 insertions, 3 deletions

diff --git a/include/speex/speex_config_types.h.in b/include/speex/speex_config_types.h.in
index 3fab2ae..02b82fd 100644
--- a/include/speex/speex_config_types.h.in
+++ b/include/speex/speex_config_types.h.in
@@ -1,11 +1,18 @@
 #ifndef __SPEEX_TYPES_H__
 #define __SPEEX_TYPES_H__
 
-/* these are filled in by configure */
+#if defined HAVE_STDINT_H
+#  include <stdint.h>
+#elif defined HAVE_INTTYPES_H
+#  include <inttypes.h>
+#elif defined HAVE_SYS_TYPES_H
+#  include <sys/types.h>
+#endif
+
 typedef @SIZE16@ spx_int16_t;
-typedef unsigned @SIZE16@ spx_uint16_t;
+typedef @USIZE16@ spx_uint16_t;
 typedef @SIZE32@ spx_int32_t;
-typedef unsigned @SIZE32@ spx_uint32_t;
+typedef @USIZE32@ spx_uint32_t;
 
 #endif