From 9abb82d5fb7911a113364ee4eab1b85cbd1ef899 Mon Sep 17 00:00:00 2001 From: Tim Kientzle Date: Thu, 15 Oct 2009 23:54:55 -0400 Subject: [PATCH] Windows build fixes from Bill Hoffman. SVN-Revision: 1534 --- build/cmake/CheckFuncs.cmake | 34 ++++++++++++++++++---------------- libarchive/archive_entry.h | 6 +++--- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/build/cmake/CheckFuncs.cmake b/build/cmake/CheckFuncs.cmake index 472136191..e9a5933a1 100644 --- a/build/cmake/CheckFuncs.cmake +++ b/build/cmake/CheckFuncs.cmake @@ -25,21 +25,23 @@ INCLUDE(CheckFunctionExists) MACRO (CHECK_FUNCTION_EXISTS_GLIBC _FUNC _FUNCVAR) - SET(CHECK_STUB_FUNC_1 "__stub_${_FUNC}") - SET(CHECK_STUB_FUNC_2 "__stub___${_FUNC}") - CONFIGURE_FILE( ${CMAKE_SOURCE_DIR}/build/cmake/CheckFuncs_stub.c.in - ${CMAKE_BINARY_DIR}/cmake.tmp/CheckFuncs_stub.c IMMEDIATE) - TRY_COMPILE(__stub - ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}/cmake.tmp/CheckFuncs_stub.c - COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} - CMAKE_FLAGS - -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_INCLUDE_FILE_FLAGS} - "${CHECK_INCLUDE_FILE_C_INCLUDE_DIRS}") - IF (__stub) - SET("${_FUNCVAR}" "" CACHE INTERNAL "Have function ${_FUNC}") - ELSE (__stub) - CHECK_FUNCTION_EXISTS("${_FUNC}" "${_FUNCVAR}") - ENDIF (__stub) + IF(NOT DEFINED ${_FUNCVAR}) + SET(CHECK_STUB_FUNC_1 "__stub_${_FUNC}") + SET(CHECK_STUB_FUNC_2 "__stub___${_FUNC}") + CONFIGURE_FILE( ${libarchive_SOURCE_DIR}/build/cmake/CheckFuncs_stub.c.in + ${CMAKE_BINARY_DIR}/cmake.tmp/CheckFuncs_stub.c IMMEDIATE) + TRY_COMPILE(__stub + ${CMAKE_BINARY_DIR} + ${CMAKE_BINARY_DIR}/cmake.tmp/CheckFuncs_stub.c + COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} + CMAKE_FLAGS + -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_INCLUDE_FILE_FLAGS} + "${CHECK_INCLUDE_FILE_C_INCLUDE_DIRS}") + IF (__stub) + SET("${_FUNCVAR}" "" CACHE INTERNAL "Have function ${_FUNC}") + ELSE (__stub) + CHECK_FUNCTION_EXISTS("${_FUNC}" "${_FUNCVAR}") + ENDIF (__stub) + ENDIF(NOT DEFINED ${_FUNCVAR}) ENDMACRO (CHECK_FUNCTION_EXISTS_GLIBC) diff --git a/libarchive/archive_entry.h b/libarchive/archive_entry.h index 9e4a7b6e4..fa5d9439e 100644 --- a/libarchive/archive_entry.h +++ b/libarchive/archive_entry.h @@ -198,7 +198,7 @@ __LA_DECL const wchar_t *archive_entry_gname_w(struct archive_entry *); __LA_DECL const char *archive_entry_hardlink(struct archive_entry *); __LA_DECL const wchar_t *archive_entry_hardlink_w(struct archive_entry *); __LA_DECL __LA_INO_T archive_entry_ino(struct archive_entry *); -__LA_DECL int64_t archive_entry_ino64(struct archive_entry *); +__LA_DECL __LA_INT64_T archive_entry_ino64(struct archive_entry *); __LA_DECL __LA_MODE_T archive_entry_mode(struct archive_entry *); __LA_DECL time_t archive_entry_mtime(struct archive_entry *); __LA_DECL long archive_entry_mtime_nsec(struct archive_entry *); @@ -262,11 +262,11 @@ __LA_DECL void archive_entry_copy_hardlink(struct archive_entry *, const char *) __LA_DECL void archive_entry_copy_hardlink_w(struct archive_entry *, const wchar_t *); #if ARCHIVE_VERSION_NUMBER >= 3000000 /* Starting with libarchive 3.0, this will be synonym for ino64. */ -__LA_DECL void archive_entry_set_ino(struct archive_entry *, int64_t); +__LA_DECL void archive_entry_set_ino(struct archive_entry *, __LA_INT64_T); #else __LA_DECL void archive_entry_set_ino(struct archive_entry *, unsigned long); #endif -__LA_DECL void archive_entry_set_ino64(struct archive_entry *, int64_t); +__LA_DECL void archive_entry_set_ino64(struct archive_entry *, __LA_INT64_T); __LA_DECL void archive_entry_set_link(struct archive_entry *, const char *); __LA_DECL void archive_entry_copy_link(struct archive_entry *, const char *); __LA_DECL void archive_entry_copy_link_w(struct archive_entry *, const wchar_t *); -- 2.47.3