From 6f4727aaa04df63e24e2d514c7f6ba924491b8e5 Mon Sep 17 00:00:00 2001
From: Rose <83477269+AtariDreams@users.noreply.github.com>
Date: Sat, 23 Oct 2021 11:27:46 -0400
Subject: Source: Replace C headers with C++ ones

In applicable areas only, of course.
---
 Source/CPack/cmCPackDragNDropGenerator.h  | 3 +--
 Source/CPack/cmCPackLog.h                 | 3 +--
 Source/CTest/cmCTestBuildAndTestHandler.h | 3 +--
 Source/CTest/cmCTestBuildHandler.h        | 3 +--
 Source/CTest/cmCTestGenericHandler.h      | 3 +--
 Source/CTest/cmCTestLaunch.cxx            | 3 ++-
 Source/CTest/cmCTestLaunchReporter.cxx    | 3 ++-
 Source/CTest/cmCTestMultiProcessHandler.h | 2 +-
 Source/CTest/cmCTestRunTest.h             | 3 +--
 Source/CTest/cmCTestTestHandler.h         | 3 +--
 Source/CTest/cmProcess.h                  | 4 ++--
 Source/bindexplib.h                       | 3 +--
 Source/cmAffinity.cxx                     | 2 +-
 Source/cmGlobalVisualStudio7Generator.cxx | 3 +--
 Source/cmIDEOptions.cxx                   | 3 +--
 Source/cmLocalVisualStudio7Generator.cxx  | 3 ++-
 Source/cmSystemTools.cxx                  | 2 +-
 Source/cmVisualStudioSlnParser.h          | 3 +--
 Source/cmVisualStudioWCEPlatformParser.h  | 3 +--
 Source/cm_codecvt.cxx                     | 6 +++---
 Source/cmcmd.cxx                          | 1 -
 21 files changed, 26 insertions(+), 36 deletions(-)

diff --git a/Source/CPack/cmCPackDragNDropGenerator.h b/Source/CPack/cmCPackDragNDropGenerator.h
index 310b0ab9ac..c96d0354f0 100644
--- a/Source/CPack/cmCPackDragNDropGenerator.h
+++ b/Source/CPack/cmCPackDragNDropGenerator.h
@@ -4,12 +4,11 @@
 
 #include "cmConfigure.h" // IWYU pragma: keep
 
+#include <cstddef>
 #include <sstream>
 #include <string>
 #include <vector>
 
-#include <stddef.h>
-
 #include "cmCPackGenerator.h"
 
 class cmGeneratedFileStream;
diff --git a/Source/CPack/cmCPackLog.h b/Source/CPack/cmCPackLog.h
index 6cec39cd81..aa9a17f86a 100644
--- a/Source/CPack/cmCPackLog.h
+++ b/Source/CPack/cmCPackLog.h
@@ -4,12 +4,11 @@
 
 #include "cmConfigure.h" // IWYU pragma: keep
 
+#include <cstring>
 #include <memory>
 #include <ostream>
 #include <string>
 
-#include <string.h>
-
 #define cmCPack_Log(ctSelf, logType, msg)                                     \
   do {                                                                        \
     std::ostringstream cmCPackLog_msg;                                        \
diff --git a/Source/CTest/cmCTestBuildAndTestHandler.h b/Source/CTest/cmCTestBuildAndTestHandler.h
index b9cc35ccbd..e022e68538 100644
--- a/Source/CTest/cmCTestBuildAndTestHandler.h
+++ b/Source/CTest/cmCTestBuildAndTestHandler.h
@@ -4,12 +4,11 @@
 
 #include "cmConfigure.h" // IWYU pragma: keep
 
+#include <cstddef>
 #include <sstream>
 #include <string>
 #include <vector>
 
-#include <stddef.h>
-
 #include "cmCTestGenericHandler.h"
 #include "cmDuration.h"
 
diff --git a/Source/CTest/cmCTestBuildHandler.h b/Source/CTest/cmCTestBuildHandler.h
index 58e8d9cbb1..e33294d8f4 100644
--- a/Source/CTest/cmCTestBuildHandler.h
+++ b/Source/CTest/cmCTestBuildHandler.h
@@ -5,13 +5,12 @@
 #include "cmConfigure.h" // IWYU pragma: keep
 
 #include <chrono>
+#include <cstddef>
 #include <deque>
 #include <iosfwd>
 #include <string>
 #include <vector>
 
-#include <stddef.h>
-
 #include "cmsys/RegularExpression.hxx"
 
 #include "cmCTestGenericHandler.h"
diff --git a/Source/CTest/cmCTestGenericHandler.h b/Source/CTest/cmCTestGenericHandler.h
index b4b0ad8a2a..4bdb9c2adf 100644
--- a/Source/CTest/cmCTestGenericHandler.h
+++ b/Source/CTest/cmCTestGenericHandler.h
@@ -4,12 +4,11 @@
 
 #include "cmConfigure.h" // IWYU pragma: keep
 
+#include <cstddef>
 #include <map>
 #include <string>
 #include <vector>
 
-#include <stddef.h>
-
 #include "cmCTest.h"
 #include "cmSystemTools.h"
 #include "cmValue.h"
diff --git a/Source/CTest/cmCTestLaunch.cxx b/Source/CTest/cmCTestLaunch.cxx
index 15c443a4c7..4a33869fdd 100644
--- a/Source/CTest/cmCTestLaunch.cxx
+++ b/Source/CTest/cmCTestLaunch.cxx
@@ -20,9 +20,10 @@
 #include "cmake.h"
 
 #ifdef _WIN32
+#  include <cstdio> // for std{out,err} and fileno
+
 #  include <fcntl.h> // for _O_BINARY
 #  include <io.h>    // for _setmode
-#  include <stdio.h> // for std{out,err} and fileno
 #endif
 
 cmCTestLaunch::cmCTestLaunch(int argc, const char* const* argv)
diff --git a/Source/CTest/cmCTestLaunchReporter.cxx b/Source/CTest/cmCTestLaunchReporter.cxx
index 5334a930ef..149ba5d19f 100644
--- a/Source/CTest/cmCTestLaunchReporter.cxx
+++ b/Source/CTest/cmCTestLaunchReporter.cxx
@@ -13,9 +13,10 @@
 #include "cmXMLWriter.h"
 
 #ifdef _WIN32
+#  include <cstdio> // for std{out,err} and fileno
+
 #  include <fcntl.h> // for _O_BINARY
 #  include <io.h>    // for _setmode
-#  include <stdio.h> // for std{out,err} and fileno
 #endif
 
 cmCTestLaunchReporter::cmCTestLaunchReporter()
diff --git a/Source/CTest/cmCTestMultiProcessHandler.h b/Source/CTest/cmCTestMultiProcessHandler.h
index 5de42f9e32..2f5ad400fc 100644
--- a/Source/CTest/cmCTestMultiProcessHandler.h
+++ b/Source/CTest/cmCTestMultiProcessHandler.h
@@ -4,6 +4,7 @@
 
 #include "cmConfigure.h" // IWYU pragma: keep
 
+#include <cstddef>
 #include <map>
 #include <memory>
 #include <set>
@@ -11,7 +12,6 @@
 #include <vector>
 
 #include <cm3p/uv.h>
-#include <stddef.h>
 
 #include "cmCTest.h"
 #include "cmCTestResourceAllocator.h"
diff --git a/Source/CTest/cmCTestRunTest.h b/Source/CTest/cmCTestRunTest.h
index 2082156b8f..7a97fa9295 100644
--- a/Source/CTest/cmCTestRunTest.h
+++ b/Source/CTest/cmCTestRunTest.h
@@ -4,14 +4,13 @@
 
 #include "cmConfigure.h" // IWYU pragma: keep
 
+#include <cstddef>
 #include <map>
 #include <memory>
 #include <set>
 #include <string>
 #include <vector>
 
-#include <stddef.h>
-
 #include "cmCTest.h"
 #include "cmCTestMultiProcessHandler.h"
 #include "cmCTestTestHandler.h"
diff --git a/Source/CTest/cmCTestTestHandler.h b/Source/CTest/cmCTestTestHandler.h
index 3ac05e7bfe..135e764084 100644
--- a/Source/CTest/cmCTestTestHandler.h
+++ b/Source/CTest/cmCTestTestHandler.h
@@ -5,6 +5,7 @@
 #include "cmConfigure.h" // IWYU pragma: keep
 
 #include <chrono>
+#include <cstddef>
 #include <cstdint>
 #include <iosfwd>
 #include <map>
@@ -13,8 +14,6 @@
 #include <utility>
 #include <vector>
 
-#include <stddef.h>
-
 #include "cmsys/RegularExpression.hxx"
 
 #include "cmCTest.h"
diff --git a/Source/CTest/cmProcess.h b/Source/CTest/cmProcess.h
index a44aeb07c2..64475c2a62 100644
--- a/Source/CTest/cmProcess.h
+++ b/Source/CTest/cmProcess.h
@@ -5,14 +5,14 @@
 #include "cmConfigure.h" // IWYU pragma: keep
 
 #include <chrono>
+#include <cstddef>
+#include <cstdint>
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include <cm3p/uv.h>
-#include <stddef.h>
-#include <stdint.h>
 
 #include "cmDuration.h"
 #include "cmProcessOutput.h"
diff --git a/Source/bindexplib.h b/Source/bindexplib.h
index bd1398fa7a..c5d81c7f5e 100644
--- a/Source/bindexplib.h
+++ b/Source/bindexplib.h
@@ -4,11 +4,10 @@
 
 #include "cmConfigure.h" // IWYU pragma: keep
 
+#include <cstdio>
 #include <set>
 #include <string>
 
-#include <stdio.h>
-
 class bindexplib
 {
 public:
diff --git a/Source/cmAffinity.cxx b/Source/cmAffinity.cxx
index 35443e795b..591199b684 100644
--- a/Source/cmAffinity.cxx
+++ b/Source/cmAffinity.cxx
@@ -12,7 +12,7 @@
 #    define CM_HAVE_CPU_AFFINITY
 #    include <pthread.h>
 #    include <sched.h>
-// On some platforms CPU_ZERO needs memset but sched.h forgets string.h
+// On some platforms CPU_ZERO needs memset but sched.h forgets cstring
 #    include <cstring> // IWYU pragma: keep
 #    if defined(__FreeBSD__)
 #      include <pthread_np.h>
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index 6876e6179a..58b24fc3d7 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -2,6 +2,7 @@
    file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmGlobalVisualStudio7Generator.h"
 
+#include <cassert>
 #include <utility>
 #include <vector>
 
@@ -10,8 +11,6 @@
 
 #include <windows.h>
 
-#include <assert.h>
-
 #include "cmsys/Encoding.hxx"
 
 #include "cmGeneratedFileStream.h"
diff --git a/Source/cmIDEOptions.cxx b/Source/cmIDEOptions.cxx
index b53319f510..c476d47f2a 100644
--- a/Source/cmIDEOptions.cxx
+++ b/Source/cmIDEOptions.cxx
@@ -2,12 +2,11 @@
    file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmIDEOptions.h"
 
+#include <cstring>
 #include <iterator>
 
 #include <cmext/algorithm>
 
-#include <string.h>
-
 #include "cmsys/String.h"
 
 #include "cmAlgorithms.h"
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 5d3e11a64f..7223049635 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -2,13 +2,14 @@
    file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmLocalVisualStudio7Generator.h"
 
+#include <cctype> // for isspace
+
 #include <cm/memory>
 #include <cmext/algorithm>
 
 #include <windows.h>
 
 #include <cm3p/expat.h>
-#include <ctype.h> // for isspace
 
 #include "cmComputeLinkInformation.h"
 #include "cmCustomCommand.h"
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 1b07358677..3699be3a5a 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -540,7 +540,7 @@ size_t cmSystemTools::CalculateCommandLineLengthLimit()
 #if defined(_SC_ARG_MAX)
   // ARG_MAX is the maximum size of the command and environment
   // that can be passed to the exec functions on UNIX.
-  // The value in limits.h does not need to be present and may
+  // The value in climits does not need to be present and may
   // depend upon runtime memory constraints, hence sysconf()
   // should be used to query it.
   long szArgMax = sysconf(_SC_ARG_MAX);
diff --git a/Source/cmVisualStudioSlnParser.h b/Source/cmVisualStudioSlnParser.h
index 1c3375951a..60be598429 100644
--- a/Source/cmVisualStudioSlnParser.h
+++ b/Source/cmVisualStudioSlnParser.h
@@ -5,13 +5,12 @@
 #include "cmConfigure.h" // IWYU pragma: keep
 
 #include <bitset>
+#include <cstddef>
 #include <iosfwd>
 #include <string>
 
 #include <cm/string_view>
 
-#include <stddef.h>
-
 class cmSlnData;
 
 class cmVisualStudioSlnParser
diff --git a/Source/cmVisualStudioWCEPlatformParser.h b/Source/cmVisualStudioWCEPlatformParser.h
index eb4e978a2c..2fff91c2e7 100644
--- a/Source/cmVisualStudioWCEPlatformParser.h
+++ b/Source/cmVisualStudioWCEPlatformParser.h
@@ -4,12 +4,11 @@
 
 #include "cmConfigure.h" // IWYU pragma: keep
 
+#include <cstddef>
 #include <map>
 #include <string>
 #include <vector>
 
-#include <stddef.h>
-
 #include "cmXMLParser.h"
 
 // This class is used to parse XML with configuration
diff --git a/Source/cm_codecvt.cxx b/Source/cm_codecvt.cxx
index df4440f571..ddee968a8b 100644
--- a/Source/cm_codecvt.cxx
+++ b/Source/cm_codecvt.cxx
@@ -3,10 +3,10 @@
 #include "cm_codecvt.hxx"
 
 #if defined(_WIN32)
-#  include <windows.h>
+#  include <cassert>
+#  include <cstring>
 
-#  include <assert.h>
-#  include <string.h>
+#  include <windows.h>
 #  undef max
 #  include "cmsys/Encoding.hxx"
 #endif
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index 8376d4df8b..32c01e5274 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -58,7 +58,6 @@
 #ifdef _WIN32
 #  include <fcntl.h> // for _O_BINARY
 #  include <io.h>    // for _setmode
-#  include <stdio.h> // for std{out,err} and fileno
 #endif
 
 #include <cm/string_view>
-- 
cgit v1.2.1