[Cmake-commits] [cmake-commits] king committed archive_platform.h 1.3 1.4
cmake-commits at cmake.org
cmake-commits at cmake.org
Wed Nov 18 15:50:26 EST 2009
Update of /cvsroot/CMake/CMake/Utilities/cmlibarchive/libarchive
In directory public:/mounts/ram/cvs-serv26757/Utilities/cmlibarchive/libarchive
Modified Files:
archive_platform.h
Log Message:
libarchive: Include integer types very early
In libarchive/archive_platform.h we should include <stdint.h> or
<inttypes.h> 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).
Index: archive_platform.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Utilities/cmlibarchive/libarchive/archive_platform.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** archive_platform.h 4 Nov 2009 18:10:10 -0000 1.3
--- archive_platform.h 18 Nov 2009 20:50:24 -0000 1.4
***************
*** 53,56 ****
--- 53,64 ----
#endif
+ /* Try to get standard C99-style integer type definitions. */
+ #if HAVE_INTTYPES_H
+ #include <inttypes.h>
+ #endif
+ #if HAVE_STDINT_H
+ #include <stdint.h>
+ #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
***************
*** 79,90 ****
#endif
- /* Try to get standard C99-style integer type definitions. */
- #if HAVE_INTTYPES_H
- #include <inttypes.h>
- #endif
- #if HAVE_STDINT_H
- #include <stdint.h>
- #endif
-
/* Borland warns about its own constants! */
#if defined(__BORLANDC__)
--- 87,90 ----
More information about the Cmake-commits
mailing list