From 8bcc597b9c6c82e294bca535ff7b58503f49e4d8 Mon Sep 17 00:00:00 2001 From: Monty Date: Tue, 26 Oct 2010 10:56:31 +0000 Subject: Update/modernize the configure type checking, account for the fact that int types might come from one of three different includes on a modern system. Try, if possible, to use types that don't rely on any of the includes such that the oldest systems have more of a fighting chance. Addresses Trac #849 svn path=/trunk/ogg/; revision=17566 --- include/ogg/config_types.h.in | 14 ++++++++++++++ include/ogg/os_types.h | 3 +-- 2 files changed, 15 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/ogg/config_types.h.in b/include/ogg/config_types.h.in index 568a001..750e29d 100644 --- a/include/ogg/config_types.h.in +++ b/include/ogg/config_types.h.in @@ -2,6 +2,20 @@ #define __CONFIG_TYPES_H__ /* these are filled in by configure */ +#define INCLUDE_INTTYPES_H @INCLUDE_INTTYPES_H@ +#define INCLUDE_STDINT_H @INCLUDE_STDINT_H@ +#define INCLUDE_SYS_TYPES_H @INCLUDE_SYS_TYPES_H@ + +#if INCLUDE_INTTYPES_H +# include +#endif +#if INCLUDE_STDINT_H +# include +#endif +#if INCLUDE_SYS_TYPES_H +# include +#endif + typedef @SIZE16@ ogg_int16_t; typedef @USIZE16@ ogg_uint16_t; typedef @SIZE32@ ogg_int32_t; diff --git a/include/ogg/os_types.h b/include/ogg/os_types.h index 4d4315d..7dc938c 100644 --- a/include/ogg/os_types.h +++ b/include/ogg/os_types.h @@ -68,7 +68,7 @@ #elif (defined(__APPLE__) && defined(__MACH__)) /* MacOS X Framework build */ -# include +# include typedef int16_t ogg_int16_t; typedef u_int16_t ogg_uint16_t; typedef int32_t ogg_int32_t; @@ -140,7 +140,6 @@ #else -# include # include #endif -- cgit v1.2.1