Assume existence of stdint.h

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)
 

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 <stdint.h> header file.
-#cmakedefine EXV_HAVE_STDINT_H
-
 // Define if you have the <strings.h> header file.
 #cmakedefine EXV_HAVE_STRINGS_H
 

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 )

include/exiv2/types.hpp

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

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;

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

xmpsdk/include/MD5.h

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