From 4be8b22ca5bfa6878bd746383c7e347e5687293b Mon Sep 17 00:00:00 2001
From: Richard Kreckel <kreckel@ginac.de>
Date: Wed, 13 Apr 2016 08:10:22 +0200
Subject: [PATCH] Prefer C library wrappers over C headers, where possible.

---
 acinclude.m4                     | 5 ++++-
 cmake/modules/FindGiNaC.cmake    | 2 +-
 cmake/modules/FindReadline.cmake | 2 +-
 ginsh/ginsh.h                    | 7 +++----
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 5471a53c..0b6db8c1 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -30,6 +30,9 @@ AC_CACHE_CHECK([for standard C++ header files], [ginac_cv_std_cxx_headers], [
 	AC_LANG_PUSH([C++])
 	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 		#include <algorithm>
+		#include <cstddef>
+		#include <cstdio>
+		#include <cstdlib>
 		#include <cstring>
 		#include <cstddef>
 		#include <cstdint>
@@ -81,7 +84,7 @@ else
 	AC_CACHE_CHECK([for version of libreadline], [ginac_cv_rl_supported], [
 		ginac_cv_rl_supported="no"
 		AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-			#include <stdio.h>
+			#include <cstdio>
 			#include <readline/readline.h>
 			#if !defined(RL_VERSION_MAJOR) || !defined(RL_VERSION_MINOR)
 			#error "Ancient/unsupported version of readline"
diff --git a/cmake/modules/FindGiNaC.cmake b/cmake/modules/FindGiNaC.cmake
index e12ed686..fc50d1c3 100644
--- a/cmake/modules/FindGiNaC.cmake
+++ b/cmake/modules/FindGiNaC.cmake
@@ -116,7 +116,7 @@ if (GINAC_INCLUDE_DIRS AND GINAC_LIBRARIES AND NOT CMAKE_CROSSCOMPILING)
 	check_cxx_source_runs("
 		#include <ginac/version.h>
 		#include <cln/version.h>
-		#include <stdio.h>
+		#include <cstdio>
 		int main() {
 			return (CL_VERSION_MAJOR == cln::version_major) &&
 			       (CL_VERSION_MINOR == cln::version_minor) &&
diff --git a/cmake/modules/FindReadline.cmake b/cmake/modules/FindReadline.cmake
index ab3e8f91..007fc5b8 100644
--- a/cmake/modules/FindReadline.cmake
+++ b/cmake/modules/FindReadline.cmake
@@ -21,7 +21,7 @@ if (READLINE_INCLUDE_DIRS AND READLINE_LIBRARIES)
 	set(_save_req_includes ${CMAKE_REQUIRED_INCLUDES})
 	set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${READLINE_INCLUDE_DIR})
 	check_cxx_source_compiles("
-		#include <stdio.h>
+		#include <cstdio>
 		#include <readline/readline.h>
 		#if !defined(RL_VERSION_MAJOR) || !defined(RL_VERSION_MINOR)
 		#error Ancient version of readline
diff --git a/ginsh/ginsh.h b/ginsh/ginsh.h
index cafe713a..a8c4c1c6 100644
--- a/ginsh/ginsh.h
+++ b/ginsh/ginsh.h
@@ -22,10 +22,9 @@
 #ifndef GINSH_H
 #define GINSH_H
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <map>
 #include <iostream>
 #include <string>
-- 
2.44.0