From d55b2b1b651290fa4feb931bffd3eb00819c43b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20D=C3=ADaz=20M=C3=A1s?= <piponazo@gmail.com>
Date: Wed, 2 May 2018 23:11:00 +0200
Subject: [PATCH] Remove HAVE_STDLIB_H check and replace stdlib.h by cstdlib

---
 config/config.h.cmake                | 3 ---
 config/config.h.in                   | 3 ---
 config/generateConfigFile.cmake      | 1 -
 include/exiv2/exv_msvc.h             | 3 ---
 samples/conntest.cpp                 | 2 +-
 samples/exiv2json.cpp                | 2 +-
 samples/geotag.cpp                   | 2 +-
 src/exiv2app.hpp                     | 2 +-
 src/http.cpp                         | 2 +-
 src/ini.cpp                          | 2 +-
 xmpsdk/include/XMP_Environment.h     | 2 +-
 xmpsdk/src/XMPUtils-FileInfo.cpp     | 2 +-
 xmpsdk/src/XMPUtils.cpp              | 2 +-
 xmpsdk/third-party/expat/lib/expat.h | 2 +-
 14 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/config/config.h.cmake b/config/config.h.cmake
index d90b1df5..933bae7f 100644
--- a/config/config.h.cmake
+++ b/config/config.h.cmake
@@ -57,9 +57,6 @@
 #endif
 #endif
 
-// Define if you have the <stdlib.h> header file.
-#cmakedefine EXV_HAVE_STDLIB_H
-
 // Define if you have the strerror function.
 #cmakedefine EXV_HAVE_STRERROR
 
diff --git a/config/config.h.in b/config/config.h.in
index f9462689..12cd4040 100644
--- a/config/config.h.in
+++ b/config/config.h.in
@@ -65,9 +65,6 @@
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
 /* Define to 1 if you have the `strchr' function. */
 #undef HAVE_STRCHR
 
diff --git a/config/generateConfigFile.cmake b/config/generateConfigFile.cmake
index 575a8100..9c1bda8a 100644
--- a/config/generateConfigFile.cmake
+++ b/config/generateConfigFile.cmake
@@ -36,7 +36,6 @@ check_include_file( "memory.h"  EXV_HAVE_MEMORY_H )
 check_include_file( "process.h" EXV_HAVE_PROCESS_H )
 check_include_file( "stdbool.h" EXV_HAVE_STDBOOL_H )
 check_include_file( "stdint.h"  EXV_HAVE_STDINT_H )
-check_include_file( "stdlib.h"  EXV_HAVE_STDLIB_H )
 check_include_file( "strings.h" EXV_HAVE_STRINGS_H )
 check_include_file( "sys/mman.h"    EXV_HAVE_SYS_MMAN_H )
 check_include_file( "sys/stat.h"    EXV_HAVE_SYS_STAT_H )
diff --git a/include/exiv2/exv_msvc.h b/include/exiv2/exv_msvc.h
index 0536f31e..dff30e78 100644
--- a/include/exiv2/exv_msvc.h
+++ b/include/exiv2/exv_msvc.h
@@ -82,9 +82,6 @@
 /* Define to 1 if you have the <stdint.h> header file. */
 /* #undef EXV_HAVE_STDINT_H */
 
-/* Define to 1 if you have the <stdlib.h> header file. */
-/* #undef EXV_HAVE_STDLIB_H */
-
 /* Define to 1 if you have the `strerror' function. */
 #define EXV_HAVE_STRERROR 1
 
diff --git a/samples/conntest.cpp b/samples/conntest.cpp
index 3d7d4a69..6ea3eef2 100644
--- a/samples/conntest.cpp
+++ b/samples/conntest.cpp
@@ -5,7 +5,7 @@
 #include <exiv2/exiv2.hpp>
 
 #include <iostream>
-#include <stdlib.h>
+#include <cstdlib>
 
 void httpcon(const std::string& url, bool useHttp1_0 = false) {
     Exiv2::Dictionary response;
diff --git a/samples/exiv2json.cpp b/samples/exiv2json.cpp
index 7a8d55b7..cf025b97 100644
--- a/samples/exiv2json.cpp
+++ b/samples/exiv2json.cpp
@@ -13,7 +13,7 @@
 #include <vector>
 #include <set>
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <limits.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/samples/geotag.cpp b/samples/geotag.cpp
index 6d549ddb..d190100a 100644
--- a/samples/geotag.cpp
+++ b/samples/geotag.cpp
@@ -12,7 +12,7 @@
 #include <algorithm>
 
 #include <stdio.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include <time.h>
 #include <string.h>
 #include <sys/stat.h>
diff --git a/src/exiv2app.hpp b/src/exiv2app.hpp
index e35ef723..d0f46797 100644
--- a/src/exiv2app.hpp
+++ b/src/exiv2app.hpp
@@ -47,7 +47,7 @@
 
 // stdin handler includes
 #ifndef  _MSC_VER
-#include <stdlib.h>
+#include <cstdlib>
 #include <stdio.h>
 #include <string.h>
 #if defined(__CYGWIN__) || defined(__MINGW__)
diff --git a/src/http.cpp b/src/http.cpp
index 86b7ebb7..aa400ac2 100644
--- a/src/http.cpp
+++ b/src/http.cpp
@@ -37,7 +37,7 @@
 
 #include <sys/types.h>
 #include <stdio.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include <time.h>
 #include <sys/stat.h>
 #include <string.h>
diff --git a/src/ini.cpp b/src/ini.cpp
index 7b67f4c6..43336e81 100755
--- a/src/ini.cpp
+++ b/src/ini.cpp
@@ -33,7 +33,7 @@ https://github.com/benhoyt/inih
 #include <string.h>
 
 #if !INI_USE_STACK
-#include <stdlib.h>
+#include <cstdlib>
 #endif
 
 #define MAX_SECTION 50
diff --git a/xmpsdk/include/XMP_Environment.h b/xmpsdk/include/XMP_Environment.h
index 46de0695..75a8e7a7 100644
--- a/xmpsdk/include/XMP_Environment.h
+++ b/xmpsdk/include/XMP_Environment.h
@@ -154,7 +154,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <strings.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include <math.h>
 #if defined(__cplusplus)
 #include <ios>
diff --git a/xmpsdk/src/XMPUtils-FileInfo.cpp b/xmpsdk/src/XMPUtils-FileInfo.cpp
index 6a79a2bf..6f76cdc3 100644
--- a/xmpsdk/src/XMPUtils-FileInfo.cpp
+++ b/xmpsdk/src/XMPUtils-FileInfo.cpp
@@ -13,7 +13,7 @@
 
 #include <time.h>
 #include <string.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include <locale.h>
 #include <errno.h>
 
diff --git a/xmpsdk/src/XMPUtils.cpp b/xmpsdk/src/XMPUtils.cpp
index dd0d2ceb..bced8c01 100644
--- a/xmpsdk/src/XMPUtils.cpp
+++ b/xmpsdk/src/XMPUtils.cpp
@@ -17,7 +17,7 @@
 
 #include <time.h>
 #include <string.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include <locale.h>
 #include <errno.h>
 
diff --git a/xmpsdk/third-party/expat/lib/expat.h b/xmpsdk/third-party/expat/lib/expat.h
index 9a21680b..20215aa0 100644
--- a/xmpsdk/third-party/expat/lib/expat.h
+++ b/xmpsdk/third-party/expat/lib/expat.h
@@ -14,7 +14,7 @@
 #define XML_SetExternalEntityRefHandlerArg  XML_SetExternalEntRefHandlerArg
 #endif
 
-#include <stdlib.h>
+#include <cstdlib>
 #include "expat_external.h"
 
 #ifdef __cplusplus