From f39b23806b9dd76c43de34c855f3a8832fb8a25a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20D=C3=ADaz=20M=C3=A1s?= Date: Wed, 16 Sep 2020 21:40:05 +0200 Subject: [PATCH] Assume existence of stdint.h --- CMakeLists.txt | 2 +- cmake/config.h.cmake | 3 --- cmake/generateConfigFile.cmake | 1 - include/exiv2/types.hpp | 2 -- src/version.cpp | 2 -- xmpsdk/CMakeLists.txt | 5 ----- xmpsdk/include/MD5.h | 13 +------------ 7 files changed, 2 insertions(+), 26 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index eddde1f6..c8f9d088 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ project(exiv2 # use TWEAK to categorize the build # 0.27.3.2 = RC2 # 0.27.3.20 = RC2 Preview # 0.27.3.29 = RC2 Not for release - LANGUAGES CXX C + LANGUAGES CXX ) include(cmake/mainSetup.cmake REQUIRED) diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake index 917073f2..4694d99e 100644 --- a/cmake/config.h.cmake +++ b/cmake/config.h.cmake @@ -47,9 +47,6 @@ // Define if stdbool.h conforms to C99. #cmakedefine EXV_HAVE_STDBOOL_H -// Define if you have the header file. -#cmakedefine EXV_HAVE_STDINT_H - // Define if you have the header file. #cmakedefine EXV_HAVE_STRINGS_H diff --git a/cmake/generateConfigFile.cmake b/cmake/generateConfigFile.cmake index f15983a5..58a632ca 100644 --- a/cmake/generateConfigFile.cmake +++ b/cmake/generateConfigFile.cmake @@ -40,7 +40,6 @@ int main() { check_include_file_cxx( "memory.h" EXV_HAVE_MEMORY_H ) check_include_file_cxx( "process.h" EXV_HAVE_PROCESS_H ) check_include_file_cxx( "stdbool.h" EXV_HAVE_STDBOOL_H ) -check_include_file_cxx( "stdint.h" EXV_HAVE_STDINT_H ) check_include_file_cxx( "strings.h" EXV_HAVE_STRINGS_H ) check_include_file_cxx( "sys/stat.h" EXV_HAVE_SYS_STAT_H ) check_include_file_cxx( "sys/types.h" EXV_HAVE_SYS_TYPES_H ) diff --git a/include/exiv2/types.hpp b/include/exiv2/types.hpp index 33ee3720..c19ca72c 100644 --- a/include/exiv2/types.hpp +++ b/include/exiv2/types.hpp @@ -58,9 +58,7 @@ typedef __int64 int64_t; # endif #else - #ifdef EXV_HAVE_STDINT_H # include - #endif #endif diff --git a/src/version.cpp b/src/version.cpp index 0cd62c40..ea8d504c 100644 --- a/src/version.cpp +++ b/src/version.cpp @@ -391,9 +391,7 @@ void Exiv2::dumpLibraryInfo(std::ostream& os,const exv_grep_keys_t& keys) have_stdbool=1; #endif -#ifdef EXV_HAVE_STDINT_H have_stdint=1; -#endif #ifdef EXV_HAVE_STDLIB_H have_stdlib=1; diff --git a/xmpsdk/CMakeLists.txt b/xmpsdk/CMakeLists.txt index ae011dc3..8728cadb 100644 --- a/xmpsdk/CMakeLists.txt +++ b/xmpsdk/CMakeLists.txt @@ -46,11 +46,6 @@ if (MSVC) target_compile_definitions(exiv2-xmp PRIVATE XML_STATIC) endif() -check_include_file( "stdint.h" EXV_HAVE_STDINT_H ) -if (EXV_HAVE_STDINT_H) - target_compile_definitions(exiv2-xmp PRIVATE EXV_HAVE_STDINT_H) -endif() - if (BUILD_SHARED_LIBS) set_property(TARGET exiv2-xmp PROPERTY POSITION_INDEPENDENT_CODE ON) endif() diff --git a/xmpsdk/include/MD5.h b/xmpsdk/include/MD5.h index dd35d8ba..5556049b 100644 --- a/xmpsdk/include/MD5.h +++ b/xmpsdk/include/MD5.h @@ -25,18 +25,7 @@ #include -#ifdef _MSC_VER -// _MSC_VER 1600 == Visual Studio 2010 -# if _MSC_VER < 1600 -# ifdef EXV_HAVE_STDINT_H -# undef EXV_HAVE_STDINT_H -# endif -# endif -#endif - -#if defined(EXV_HAVE_STDINT_H) || defined(__MINGW32__) || defined(__MING64__) || defined(__APPLE__) -# include -#endif +#include /* MSVC doesn't provide C99 types, but it has MS specific variants */ #ifdef _MSC_VER