third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Assume existence of stdint.h

Browse Source
This commit is contained in:
Luis Díaz Más 2020-09-16 21:40:05 +02:00
parent b7ee13eb63
commit f39b23806b
7 changed files with 2 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -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)

3
cmake/config.h.cmake
View File

@ -47,9 +47,6 @@
// Define if stdbool.h conforms to C99.
#cmakedefine EXV_HAVE_STDBOOL_H
// Define if you have the <stdint.h> header file.
#cmakedefine EXV_HAVE_STDINT_H
// Define if you have the <strings.h> header file.
#cmakedefine EXV_HAVE_STRINGS_H

1
cmake/generateConfigFile.cmake
View File

@ -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 )

2
include/exiv2/types.hpp
View File

@ -58,9 +58,7 @@
typedef __int64 int64_t;
# endif
#else
#ifdef EXV_HAVE_STDINT_H
# include <stdint.h>
#endif
#endif

2
src/version.cpp
View File

@ -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;

5
xmpsdk/CMakeLists.txt
View File

@ -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()

13
xmpsdk/include/MD5.h
View File

@ -25,18 +25,7 @@
#include <sys/types.h>
#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 <stdint.h>
#endif
#include <stdint.h>
/* MSVC doesn't provide C99 types, but it has MS specific variants */
#ifdef _MSC_VER