From 8cb1f4b0a4c1acba3ce9c0b1ee981facf655f216 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 18 Nov 2009 15:50:24 -0500 Subject: [PATCH] libarchive: Include integer types very early In libarchive/archive_platform.h we should include or immediately after "config.h" to define integer types referenced by configuration results. For example, on a non-conformant platform ssize_t might default to int64_t, so int64_t must be defined before ssize_t is used (and ssize_t is used in archive_windows.h). --- .../cmlibarchive/libarchive/archive_platform.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Utilities/cmlibarchive/libarchive/archive_platform.h b/Utilities/cmlibarchive/libarchive/archive_platform.h index 8cd50153c..c90057f55 100644 --- a/Utilities/cmlibarchive/libarchive/archive_platform.h +++ b/Utilities/cmlibarchive/libarchive/archive_platform.h @@ -52,6 +52,14 @@ #error Oops: No config.h and no pre-built configuration in archive_platform.h. #endif +/* Try to get standard C99-style integer type definitions. */ +#if HAVE_INTTYPES_H +#include +#endif +#if HAVE_STDINT_H +#include +#endif + /* It should be possible to get rid of this by extending the feature-test * macros to cover Windows API functions, probably along with non-trivial * refactoring of code to find structures that sit more cleanly on top of @@ -78,14 +86,6 @@ #define __FBSDID(a) struct _undefined_hack #endif -/* Try to get standard C99-style integer type definitions. */ -#if HAVE_INTTYPES_H -#include -#endif -#if HAVE_STDINT_H -#include -#endif - /* Borland warns about its own constants! */ #if defined(__BORLANDC__) # if HAVE_DECL_UINT64_MAX