[lldb][NFC] Use C++ versions of the deprecated C standard library headers

The C headers are deprecated so as requested in D102845, this is replacing them all with their (not deprecated) C++ equivalent. Reviewed By: shafik Differential Revision: https://reviews.llvm.org/D103084
2021-05-26 12:19:37 +02:00 · 2021-05-26 12:19:37 +02:00 · 76e47d4887
commit 76e47d4887
parent 21aec4fdc5
330 changed files with 558 additions and 562 deletions
--- a/lldb/include/lldb/API/SBCommandReturnObject.h
+++ b/lldb/include/lldb/API/SBCommandReturnObject.h
@ -9,7 +9,7 @@
 #ifndef LLDB_API_SBCOMMANDRETURNOBJECT_H
 #define LLDB_API_SBCOMMANDRETURNOBJECT_H

-#include <stdio.h>
+#include <cstdio>

 #include <memory>

--- a/lldb/include/lldb/API/SBDebugger.h
+++ b/lldb/include/lldb/API/SBDebugger.h
@ -9,7 +9,7 @@
 #ifndef LLDB_API_SBDEBUGGER_H
 #define LLDB_API_SBDEBUGGER_H

-#include <stdio.h>
+#include <cstdio>

 #include "lldb/API/SBDefines.h"
 #include "lldb/API/SBPlatform.h"
--- a/lldb/include/lldb/API/SBEvent.h
+++ b/lldb/include/lldb/API/SBEvent.h
@ -11,7 +11,7 @@

 #include "lldb/API/SBDefines.h"

-#include <stdio.h>
+#include <cstdio>
 #include <vector>

 namespace lldb {
--- a/lldb/include/lldb/API/SBExecutionContext.h
+++ b/lldb/include/lldb/API/SBExecutionContext.h
@ -12,7 +12,7 @@

 #include "lldb/API/SBDefines.h"

-#include <stdio.h>
+#include <cstdio>
 #include <vector>

 namespace lldb {
--- a/lldb/include/lldb/API/SBInstruction.h
+++ b/lldb/include/lldb/API/SBInstruction.h
@ -12,7 +12,7 @@
 #include "lldb/API/SBData.h"
 #include "lldb/API/SBDefines.h"

-#include <stdio.h>
+#include <cstdio>

 // There's a lot to be fixed here, but need to wait for underlying insn
 // implementation to be revised & settle down first.
--- a/lldb/include/lldb/API/SBInstructionList.h
+++ b/lldb/include/lldb/API/SBInstructionList.h
@ -11,7 +11,7 @@

 #include "lldb/API/SBDefines.h"

-#include <stdio.h>
+#include <cstdio>

 namespace lldb {

--- a/lldb/include/lldb/API/SBProcess.h
+++ b/lldb/include/lldb/API/SBProcess.h
@ -14,7 +14,7 @@
 #include "lldb/API/SBProcessInfo.h"
 #include "lldb/API/SBQueue.h"
 #include "lldb/API/SBTarget.h"
-#include <stdio.h>
+#include <cstdio>

 namespace lldb {

--- a/lldb/include/lldb/API/SBSourceManager.h
+++ b/lldb/include/lldb/API/SBSourceManager.h
@ -11,7 +11,7 @@

 #include "lldb/API/SBDefines.h"

-#include <stdio.h>
+#include <cstdio>

 namespace lldb {

--- a/lldb/include/lldb/API/SBStream.h
+++ b/lldb/include/lldb/API/SBStream.h
@ -9,7 +9,7 @@
 #ifndef LLDB_API_SBSTREAM_H
 #define LLDB_API_SBSTREAM_H

-#include <stdio.h>
+#include <cstdio>

 #include "lldb/API/SBDefines.h"

--- a/lldb/include/lldb/API/SBThread.h
+++ b/lldb/include/lldb/API/SBThread.h
@ -11,7 +11,7 @@

 #include "lldb/API/SBDefines.h"

-#include <stdio.h>
+#include <cstdio>

 namespace lldb {

--- a/lldb/include/lldb/API/SBThreadPlan.h
+++ b/lldb/include/lldb/API/SBThreadPlan.h
@ -11,7 +11,7 @@

 #include "lldb/API/SBDefines.h"

-#include <stdio.h>
+#include <cstdio>

 namespace lldb {

--- a/lldb/include/lldb/Breakpoint/StoppointHitCounter.h
+++ b/lldb/include/lldb/Breakpoint/StoppointHitCounter.h
@ -9,7 +9,7 @@
 #ifndef LLDB_BREAKPOINT_STOPPOINT_HIT_COUNTER_H
 #define LLDB_BREAKPOINT_STOPPOINT_HIT_COUNTER_H

-#include <assert.h>
+#include <cassert>
 #include <cstdint>
 #include <limits>

--- a/lldb/include/lldb/Core/Address.h
+++ b/lldb/include/lldb/Core/Address.h
@ -14,8 +14,8 @@
 #include "lldb/lldb-private-enumerations.h"
 #include "lldb/lldb-types.h"

-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>

 namespace lldb_private {
 class Block;
--- a/lldb/include/lldb/Core/AddressRange.h
+++ b/lldb/include/lldb/Core/AddressRange.h
@ -13,7 +13,7 @@
 #include "lldb/lldb-forward.h"
 #include "lldb/lldb-types.h"

-#include <stddef.h>
+#include <cstddef>

 namespace lldb_private {
 class SectionList;
--- a/lldb/include/lldb/Core/AddressResolver.h
+++ b/lldb/include/lldb/Core/AddressResolver.h
@ -13,7 +13,7 @@
 #include "lldb/Core/SearchFilter.h"
 #include "lldb/lldb-defines.h"

-#include <stddef.h>
+#include <cstddef>
 #include <vector>

 namespace lldb_private {
--- a/lldb/include/lldb/Core/AddressResolverFileLine.h
+++ b/lldb/include/lldb/Core/AddressResolverFileLine.h
@ -14,7 +14,7 @@
 #include "lldb/Core/SourceLocationSpec.h"
 #include "lldb/lldb-defines.h"

-#include <stdint.h>
+#include <cstdint>

 namespace lldb_private {
 class Address;
--- a/lldb/include/lldb/Core/Communication.h
+++ b/lldb/include/lldb/Core/Communication.h
@ -22,8 +22,8 @@
 #include <ratio>
 #include <string>

-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>

 namespace lldb_private {
 class Connection;
--- a/lldb/include/lldb/Core/Debugger.h
+++ b/lldb/include/lldb/Core/Debugger.h
@ -9,7 +9,7 @@
 #ifndef LLDB_CORE_DEBUGGER_H
 #define LLDB_CORE_DEBUGGER_H

-#include <stdint.h>
+#include <cstdint>

 #include <memory>
 #include <vector>
@ -42,9 +42,9 @@
 #include "llvm/Support/DynamicLibrary.h"
 #include "llvm/Support/Threading.h"

-#include <assert.h>
-#include <stddef.h>
-#include <stdio.h>
+#include <cassert>
+#include <cstddef>
+#include <cstdio>

 namespace llvm {
 class raw_ostream;
--- a/lldb/include/lldb/Core/Disassembler.h
+++ b/lldb/include/lldb/Core/Disassembler.h
@ -34,9 +34,9 @@
 #include <string>
 #include <vector>

-#include <stddef.h>
-#include <stdint.h>
-#include <stdio.h>
+#include <cstddef>
+#include <cstdint>
+#include <cstdio>

 namespace llvm {
 template <typename T> class SmallVectorImpl;
--- a/lldb/include/lldb/Core/DumpDataExtractor.h
+++ b/lldb/include/lldb/Core/DumpDataExtractor.h
@ -12,8 +12,8 @@
 #include "lldb/lldb-enumerations.h"
 #include "lldb/lldb-types.h"

-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>

 namespace lldb_private {
 class DataExtractor;
--- a/lldb/include/lldb/Core/EmulateInstruction.h
+++ b/lldb/include/lldb/Core/EmulateInstruction.h
@ -21,8 +21,8 @@
 #include "lldb/lldb-private-types.h"
 #include "lldb/lldb-types.h"

-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>

 namespace lldb_private {
 class OptionValueDictionary;
--- a/lldb/include/lldb/Core/FileLineResolver.h
+++ b/lldb/include/lldb/Core/FileLineResolver.h
@ -14,7 +14,7 @@
 #include "lldb/Utility/FileSpec.h"
 #include "lldb/lldb-defines.h"

-#include <stdint.h>
+#include <cstdint>

 namespace lldb_private {
 class Address;
--- a/lldb/include/lldb/Core/FileSpecList.h
+++ b/lldb/include/lldb/Core/FileSpecList.h
@ -14,7 +14,7 @@

 #include <vector>

-#include <stddef.h>
+#include <cstddef>

 namespace lldb_private {
 class Stream;
--- a/lldb/include/lldb/Core/FormatEntity.h
+++ b/lldb/include/lldb/Core/FormatEntity.h
@ -12,8 +12,8 @@
 #include "lldb/lldb-enumerations.h"
 #include "lldb/lldb-types.h"
 #include <algorithm>
-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>

 #include <string>
 #include <vector>
--- a/lldb/include/lldb/Core/IOHandler.h
+++ b/lldb/include/lldb/Core/IOHandler.h
@ -26,8 +26,8 @@
 #include <string>
 #include <vector>

-#include <stdint.h>
-#include <stdio.h>
+#include <cstdint>
+#include <cstdio>

 namespace lldb_private {
 class Debugger;
--- a/lldb/include/lldb/Core/Mangled.h
+++ b/lldb/include/lldb/Core/Mangled.h
@ -17,8 +17,8 @@

 #include "llvm/ADT/StringRef.h"

+#include <cstddef>
 #include <memory>
-#include <stddef.h>

 namespace lldb_private {

--- a/lldb/include/lldb/Core/MappedHash.h
+++ b/lldb/include/lldb/Core/MappedHash.h
@ -9,8 +9,8 @@
 #ifndef LLDB_CORE_MAPPEDHASH_H
 #define LLDB_CORE_MAPPEDHASH_H

-#include <assert.h>
-#include <stdint.h>
+#include <cassert>
+#include <cstdint>

 #include <algorithm>
 #include <functional>
--- a/lldb/include/lldb/Core/Module.h
+++ b/lldb/include/lldb/Core/Module.h
@ -32,10 +32,10 @@
 #include "llvm/Support/Chrono.h"

 #include <atomic>
+#include <cstddef>
+#include <cstdint>
 #include <memory>
 #include <mutex>
-#include <stddef.h>
-#include <stdint.h>
 #include <string>
 #include <vector>

--- a/lldb/include/lldb/Core/ModuleList.h
+++ b/lldb/include/lldb/Core/ModuleList.h
@ -27,8 +27,8 @@
 #include <mutex>
 #include <vector>

-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>

 namespace lldb_private {
 class ConstString;
--- a/lldb/include/lldb/Core/Opcode.h
+++ b/lldb/include/lldb/Core/Opcode.h
@ -14,9 +14,9 @@

 #include "llvm/Support/SwapByteOrder.h"

-#include <assert.h>
-#include <stdint.h>
-#include <string.h>
+#include <cassert>
+#include <cstdint>
+#include <cstring>

 namespace lldb {
 class SBInstruction;
--- a/lldb/include/lldb/Core/PluginManager.h
+++ b/lldb/include/lldb/Core/PluginManager.h
@ -19,8 +19,8 @@
 #include "lldb/lldb-private-interfaces.h"
 #include "llvm/ADT/StringRef.h"

-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>

 #define LLDB_PLUGIN_DEFINE_ADV(ClassName, PluginName)                          \
  namespace lldb_private {                                                     \
--- a/lldb/include/lldb/Core/SearchFilter.h
+++ b/lldb/include/lldb/Core/SearchFilter.h
@ -15,7 +15,7 @@
 #include "lldb/Utility/FileSpec.h"
 #include "lldb/lldb-forward.h"

-#include <stdint.h>
+#include <cstdint>

 namespace lldb_private {
 class Address;
--- a/lldb/include/lldb/Core/Section.h
+++ b/lldb/include/lldb/Core/Section.h
@ -21,8 +21,8 @@
 #include <memory>
 #include <vector>

-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>

 namespace lldb_private {
 class Address;
--- a/lldb/include/lldb/Core/SourceManager.h
+++ b/lldb/include/lldb/Core/SourceManager.h
@ -15,10 +15,10 @@

 #include "llvm/Support/Chrono.h"

+#include <cstddef>
 #include <cstdint>
 #include <map>
 #include <memory>
-#include <stddef.h>
 #include <string>
 #include <vector>

--- a/lldb/include/lldb/Core/StreamAsynchronousIO.h
+++ b/lldb/include/lldb/Core/StreamAsynchronousIO.h
@ -13,7 +13,7 @@

 #include <string>

-#include <stddef.h>
+#include <cstddef>

 namespace lldb_private {
 class Debugger;
--- a/lldb/include/lldb/Core/StreamBuffer.h
+++ b/lldb/include/lldb/Core/StreamBuffer.h
@ -11,7 +11,7 @@

 #include "lldb/Utility/Stream.h"
 #include "llvm/ADT/SmallVector.h"
-#include <stdio.h>
+#include <cstdio>
 #include <string>

 namespace lldb_private {
--- a/lldb/include/lldb/Core/StreamFile.h
+++ b/lldb/include/lldb/Core/StreamFile.h
@ -14,8 +14,8 @@
 #include "lldb/lldb-defines.h"
 #include "lldb/lldb-enumerations.h"

-#include <stdint.h>
-#include <stdio.h>
+#include <cstdint>
+#include <cstdio>

 namespace lldb_private {

--- a/lldb/include/lldb/Core/UserSettingsController.h
+++ b/lldb/include/lldb/Core/UserSettingsController.h
@ -17,8 +17,8 @@

 #include <vector>

-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>

 namespace lldb_private {
 class CommandInterpreter;
--- a/lldb/include/lldb/Core/Value.h
+++ b/lldb/include/lldb/Core/Value.h
@ -21,8 +21,8 @@

 #include <vector>

-#include <stdint.h>
-#include <string.h>
+#include <cstdint>
+#include <cstring>

 namespace lldb_private {
 class DataExtractor;
--- a/lldb/include/lldb/Core/ValueObject.h
+++ b/lldb/include/lldb/Core/ValueObject.h
@ -37,8 +37,8 @@
 #include <string>
 #include <utility>

-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>

 namespace lldb_private {
 class Declaration;
--- a/lldb/include/lldb/Core/ValueObjectCast.h
+++ b/lldb/include/lldb/Core/ValueObjectCast.h
@ -15,8 +15,8 @@
 #include "lldb/lldb-enumerations.h"
 #include "lldb/lldb-forward.h"

-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>

 namespace lldb_private {
 class ConstString;
--- a/lldb/include/lldb/Core/ValueObjectChild.h
+++ b/lldb/include/lldb/Core/ValueObjectChild.h
@ -20,8 +20,8 @@

 #include "llvm/ADT/Optional.h"

-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>

 namespace lldb_private {

--- a/lldb/include/lldb/Core/ValueObjectConstResult.h
+++ b/lldb/include/lldb/Core/ValueObjectConstResult.h
@ -21,8 +21,8 @@
 #include "lldb/lldb-private-enumerations.h"
 #include "lldb/lldb-types.h"

-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>

 namespace lldb_private {
 class DataExtractor;
--- a/lldb/include/lldb/Core/ValueObjectConstResultCast.h
+++ b/lldb/include/lldb/Core/ValueObjectConstResultCast.h
@ -17,8 +17,8 @@
 #include "lldb/lldb-forward.h"
 #include "lldb/lldb-types.h"

-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>

 namespace lldb_private {
 class DataExtractor;
--- a/lldb/include/lldb/Core/ValueObjectConstResultChild.h
+++ b/lldb/include/lldb/Core/ValueObjectConstResultChild.h
@ -17,8 +17,8 @@
 #include "lldb/lldb-forward.h"
 #include "lldb/lldb-types.h"

-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>

 namespace lldb_private {
 class DataExtractor;
--- a/lldb/include/lldb/Core/ValueObjectConstResultImpl.h
+++ b/lldb/include/lldb/Core/ValueObjectConstResultImpl.h
@ -15,8 +15,8 @@
 #include "lldb/lldb-private-enumerations.h"
 #include "lldb/lldb-types.h"

-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>
 namespace lldb_private {
 class CompilerType;
 class DataExtractor;
--- a/lldb/include/lldb/Core/ValueObjectDynamicValue.h
+++ b/lldb/include/lldb/Core/ValueObjectDynamicValue.h
@ -19,9 +19,9 @@
 #include "lldb/lldb-forward.h"
 #include "lldb/lldb-private-enumerations.h"

-#include <assert.h>
-#include <stddef.h>
-#include <stdint.h>
+#include <cassert>
+#include <cstddef>
+#include <cstdint>

 namespace lldb_private {
 class DataExtractor;
--- a/lldb/include/lldb/Core/ValueObjectList.h
+++ b/lldb/include/lldb/Core/ValueObjectList.h
@ -14,7 +14,7 @@

 #include <vector>

-#include <stddef.h>
+#include <cstddef>

 namespace lldb_private {
 class ValueObject;
--- a/lldb/include/lldb/Core/ValueObjectMemory.h
+++ b/lldb/include/lldb/Core/ValueObjectMemory.h
@ -18,8 +18,8 @@
 #include "lldb/lldb-forward.h"
 #include "llvm/ADT/StringRef.h"

-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>

 namespace lldb_private {
 class ExecutionContextScope;
--- a/lldb/include/lldb/Core/ValueObjectRegister.h
+++ b/lldb/include/lldb/Core/ValueObjectRegister.h
@ -18,8 +18,8 @@
 #include "lldb/lldb-forward.h"
 #include "lldb/lldb-private-types.h"

-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>

 namespace lldb_private {
 class DataExtractor;
--- a/lldb/include/lldb/Core/ValueObjectSyntheticFilter.h
+++ b/lldb/include/lldb/Core/ValueObjectSyntheticFilter.h
@ -20,7 +20,7 @@
 #include <cstdint>
 #include <memory>

-#include <stddef.h>
+#include <cstddef>

 namespace lldb_private {
 class Declaration;
--- a/lldb/include/lldb/Core/ValueObjectVariable.h
+++ b/lldb/include/lldb/Core/ValueObjectVariable.h
@ -18,8 +18,8 @@
 #include "lldb/lldb-enumerations.h"
 #include "lldb/lldb-forward.h"

-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>

 namespace lldb_private {
 class DataExtractor;
--- a/lldb/include/lldb/Core/dwarf.h
+++ b/lldb/include/lldb/Core/dwarf.h
@ -10,7 +10,7 @@
 #define LLDB_CORE_DWARF_H

 #include "lldb/Utility/RangeMap.h"
-#include <stdint.h>
+#include <cstdint>

 // Get the DWARF constant definitions from llvm
 #include "llvm/BinaryFormat/Dwarf.h"
--- a/lldb/include/lldb/DataFormatters/TypeSummary.h
+++ b/lldb/include/lldb/DataFormatters/TypeSummary.h
@ -9,7 +9,7 @@
 #ifndef LLDB_DATAFORMATTERS_TYPESUMMARY_H
 #define LLDB_DATAFORMATTERS_TYPESUMMARY_H

-#include <stdint.h>
+#include <cstdint>

 #include <functional>
 #include <memory>
--- a/lldb/include/lldb/DataFormatters/TypeSynthetic.h
+++ b/lldb/include/lldb/DataFormatters/TypeSynthetic.h
@ -9,7 +9,7 @@
 #ifndef LLDB_DATAFORMATTERS_TYPESYNTHETIC_H
 #define LLDB_DATAFORMATTERS_TYPESYNTHETIC_H

-#include <stdint.h>
+#include <cstdint>

 #include <functional>
 #include <initializer_list>
--- a/lldb/include/lldb/Host/File.h
+++ b/lldb/include/lldb/Host/File.h
@ -15,9 +15,9 @@
 #include "lldb/lldb-private.h"
 #include "llvm/ADT/BitmaskEnum.h"

+#include <cstdarg>
+#include <cstdio>
 #include <mutex>
-#include <stdarg.h>
-#include <stdio.h>
 #include <sys/types.h>

 namespace lldb_private {
--- a/lldb/include/lldb/Host/FileCache.h
+++ b/lldb/include/lldb/Host/FileCache.h
@ -8,8 +8,8 @@
 #ifndef LLDB_HOST_FILECACHE_H
 #define LLDB_HOST_FILECACHE_H

+#include <cstdint>
 #include <map>
-#include <stdint.h>

 #include "lldb/lldb-forward.h"
 #include "lldb/lldb-types.h"
--- a/lldb/include/lldb/Host/FileSystem.h
+++ b/lldb/include/lldb/Host/FileSystem.h
@ -21,8 +21,8 @@

 #include "lldb/lldb-types.h"

-#include <stdint.h>
-#include <stdio.h>
+#include <cstdint>
+#include <cstdio>
 #include <sys/stat.h>

 namespace lldb_private {
--- a/lldb/include/lldb/Host/Host.h
+++ b/lldb/include/lldb/Host/Host.h
@ -17,8 +17,8 @@
 #include "lldb/lldb-private-forward.h"
 #include "lldb/lldb-private.h"
 #include <cerrno>
+#include <cstdarg>
 #include <map>
-#include <stdarg.h>
 #include <string>
 #include <type_traits>

--- a/lldb/include/lldb/Host/HostInfoBase.h
+++ b/lldb/include/lldb/Host/HostInfoBase.h
@ -17,7 +17,7 @@
 #include "lldb/lldb-enumerations.h"
 #include "llvm/ADT/StringRef.h"

-#include <stdint.h>
+#include <cstdint>

 #include <string>

--- a/lldb/include/lldb/Host/ProcessRunLock.h
+++ b/lldb/include/lldb/Host/ProcessRunLock.h
@ -9,8 +9,8 @@
 #ifndef LLDB_HOST_PROCESSRUNLOCK_H
 #define LLDB_HOST_PROCESSRUNLOCK_H

-#include <stdint.h>
-#include <time.h>
+#include <cstdint>
+#include <ctime>

 #include "lldb/lldb-defines.h"

--- a/lldb/include/lldb/Host/SocketAddress.h
+++ b/lldb/include/lldb/Host/SocketAddress.h
@ -9,7 +9,7 @@
 #ifndef LLDB_HOST_SOCKETADDRESS_H
 #define LLDB_HOST_SOCKETADDRESS_H

-#include <stdint.h>
+#include <cstdint>

 #ifdef _WIN32
 #include "lldb/Host/windows/windows.h"
--- a/lldb/include/lldb/Host/StringConvert.h
+++ b/lldb/include/lldb/Host/StringConvert.h
@ -9,9 +9,7 @@
 #ifndef LLDB_HOST_STRINGCONVERT_H
 #define LLDB_HOST_STRINGCONVERT_H

-#include <stdint.h>
-
-
+#include <cstdint>

 namespace lldb_private {

--- a/lldb/include/lldb/Host/Time.h
+++ b/lldb/include/lldb/Host/Time.h
@ -19,7 +19,7 @@
 #include <time64.h>
 extern time_t timegm(struct tm *t);
 #else
-#include <time.h>
+#include <ctime>
 #endif

 #endif // LLDB_HOST_TIME_H
--- a/lldb/include/lldb/Host/windows/PosixApi.h
+++ b/lldb/include/lldb/Host/windows/PosixApi.h
@ -16,10 +16,10 @@
 #endif

 // va_start, va_end, etc macros.
-#include <stdarg.h>
+#include <cstdarg>

 // time_t, timespec, etc.
-#include <time.h>
+#include <ctime>

 #ifndef PATH_MAX
 #define PATH_MAX 32768
@ -68,7 +68,7 @@
 #ifdef _MSC_VER

 // PRIxxx format macros for printf()
-#include <inttypes.h>
+#include <cinttypes>

 // open(), close(), creat(), etc.
 #include <io.h>
--- a/lldb/include/lldb/Symbol/LocateSymbolFile.h
+++ b/lldb/include/lldb/Symbol/LocateSymbolFile.h
@ -9,7 +9,7 @@
 #ifndef LLDB_SYMBOL_LOCATESYMBOLFILE_H
 #define LLDB_SYMBOL_LOCATESYMBOLFILE_H

-#include <stdint.h>
+#include <cstdint>

 #include "lldb/Core/FileSpecList.h"
 #include "lldb/Utility/FileSpec.h"
--- a/lldb/include/lldb/Target/DynamicLoader.h
+++ b/lldb/include/lldb/Target/DynamicLoader.h
@ -18,8 +18,8 @@
 #include "lldb/lldb-private-enumerations.h"
 #include "lldb/lldb-types.h"

-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>
 namespace lldb_private {
 class ModuleList;
 class Process;
--- a/lldb/include/lldb/Target/Process.h
+++ b/lldb/include/lldb/Target/Process.h
@ -11,7 +11,7 @@

 #include "lldb/Host/Config.h"

-#include <limits.h>
+#include <climits>

 #include <chrono>
 #include <list>
--- a/lldb/include/lldb/Utility/Connection.h
+++ b/lldb/include/lldb/Utility/Connection.h
@ -18,7 +18,7 @@
 #include <ratio>
 #include <string>

-#include <stddef.h>
+#include <cstddef>

 namespace lldb_private {
 class Status;
--- a/lldb/include/lldb/Utility/ConstString.h
+++ b/lldb/include/lldb/Utility/ConstString.h
@ -14,7 +14,7 @@
 #include "llvm/Support/FormatVariadic.h"
 #include "llvm/Support/YAMLTraits.h"

-#include <stddef.h>
+#include <cstddef>

 namespace lldb_private {
 class Stream;
--- a/lldb/include/lldb/Utility/DataBuffer.h
+++ b/lldb/include/lldb/Utility/DataBuffer.h
@ -10,8 +10,8 @@
 #define LLDB_UTILITY_DATABUFFER_H
 #if defined(__cplusplus)

-#include <stdint.h>
-#include <string.h>
+#include <cstdint>
+#include <cstring>

 #include "lldb/lldb-types.h"

--- a/lldb/include/lldb/Utility/DataBufferLLVM.h
+++ b/lldb/include/lldb/Utility/DataBufferLLVM.h
@ -12,8 +12,8 @@
 #include "lldb/Utility/DataBuffer.h"
 #include "lldb/lldb-types.h"

+#include <cstdint>
 #include <memory>
-#include <stdint.h>

 namespace llvm {
 class WritableMemoryBuffer;
--- a/lldb/include/lldb/Utility/DataEncoder.h
+++ b/lldb/include/lldb/Utility/DataEncoder.h
@ -16,8 +16,8 @@
 #include "lldb/lldb-forward.h"
 #include "lldb/lldb-types.h"

-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>

 namespace lldb_private {

--- a/lldb/include/lldb/Utility/DataExtractor.h
+++ b/lldb/include/lldb/Utility/DataExtractor.h
@ -19,8 +19,8 @@
 #include "llvm/Support/SwapByteOrder.h"

 #include <cassert>
-#include <stdint.h>
-#include <string.h>
+#include <cstdint>
+#include <cstring>

 namespace lldb_private {
 class Log;
--- a/lldb/include/lldb/Utility/Endian.h
+++ b/lldb/include/lldb/Utility/Endian.h
@ -11,7 +11,7 @@

 #include "lldb/lldb-enumerations.h"

-#include <stdint.h>
+#include <cstdint>

 namespace lldb_private {

--- a/lldb/include/lldb/Utility/Event.h
+++ b/lldb/include/lldb/Utility/Event.h
@ -22,8 +22,8 @@
 #include <memory>
 #include <string>

-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>

 namespace lldb_private {
 class Event;
--- a/lldb/include/lldb/Utility/FileSpec.h
+++ b/lldb/include/lldb/Utility/FileSpec.h
@ -20,8 +20,8 @@
 #include "llvm/Support/Path.h"
 #include "llvm/Support/YAMLTraits.h"

-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>

 namespace lldb_private {
 class Stream;
--- a/lldb/include/lldb/Utility/GDBRemote.h
+++ b/lldb/include/lldb/Utility/GDBRemote.h
@ -17,8 +17,8 @@
 #include "llvm/Support/YAMLTraits.h"
 #include "llvm/Support/raw_ostream.h"

-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>
 #include <string>
 #include <vector>

--- a/lldb/include/lldb/Utility/IOObject.h
+++ b/lldb/include/lldb/Utility/IOObject.h
@ -9,8 +9,8 @@
 #ifndef LLDB_UTILITY_IOOBJECT_H
 #define LLDB_UTILITY_IOOBJECT_H

-#include <stdarg.h>
-#include <stdio.h>
+#include <cstdarg>
+#include <cstdio>
 #include <sys/types.h>

 #include "lldb/lldb-private.h"
--- a/lldb/include/lldb/Utility/Listener.h
+++ b/lldb/include/lldb/Utility/Listener.h
@ -23,8 +23,8 @@
 #include <string>
 #include <vector>

-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>

 namespace lldb_private {
 class ConstString;
--- a/lldb/include/lldb/Utility/Predicate.h
+++ b/lldb/include/lldb/Utility/Predicate.h
@ -9,8 +9,8 @@
 #ifndef LLDB_UTILITY_PREDICATE_H
 #define LLDB_UTILITY_PREDICATE_H

-#include <stdint.h>
-#include <time.h>
+#include <cstdint>
+#include <ctime>

 #include <condition_variable>
 #include <mutex>
--- a/lldb/include/lldb/Utility/Status.h
+++ b/lldb/include/lldb/Utility/Status.h
@ -15,7 +15,7 @@
 #include "llvm/Support/Error.h"
 #include "llvm/Support/FormatVariadic.h"
 #include <cstdarg>
-#include <stdint.h>
+#include <cstdint>
 #include <string>
 #include <system_error>
 #include <type_traits>
--- a/lldb/include/lldb/Utility/Stream.h
+++ b/lldb/include/lldb/Utility/Stream.h
@ -16,9 +16,9 @@
 #include "llvm/Support/FormatVariadic.h"
 #include "llvm/Support/raw_ostream.h"

-#include <stdarg.h>
-#include <stddef.h>
-#include <stdint.h>
+#include <cstdarg>
+#include <cstddef>
+#include <cstdint>
 #include <type_traits>

 namespace lldb_private {
--- a/lldb/include/lldb/Utility/StreamCallback.h
+++ b/lldb/include/lldb/Utility/StreamCallback.h
@ -12,8 +12,8 @@
 #include "lldb/lldb-types.h"
 #include "llvm/Support/raw_ostream.h"

-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>

 namespace lldb_private {

--- a/lldb/include/lldb/Utility/StreamString.h
+++ b/lldb/include/lldb/Utility/StreamString.h
@ -15,8 +15,8 @@

 #include <string>

-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>

 namespace lldb_private {

--- a/lldb/include/lldb/Utility/StreamTee.h
+++ b/lldb/include/lldb/Utility/StreamTee.h
@ -9,7 +9,7 @@
 #ifndef LLDB_UTILITY_STREAMTEE_H
 #define LLDB_UTILITY_STREAMTEE_H

-#include <limits.h>
+#include <climits>

 #include <mutex>

--- a/lldb/include/lldb/Utility/StringExtractor.h
+++ b/lldb/include/lldb/Utility/StringExtractor.h
@ -12,8 +12,8 @@
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/StringRef.h"

-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>
 #include <string>

 class StringExtractor {
--- a/lldb/include/lldb/Utility/StringExtractorGDBRemote.h
+++ b/lldb/include/lldb/Utility/StringExtractorGDBRemote.h
@ -15,8 +15,8 @@

 #include <string>

-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>

 class StringExtractorGDBRemote : public StringExtractor {
 public:
--- a/lldb/include/lldb/Utility/StringList.h
+++ b/lldb/include/lldb/Utility/StringList.h
@ -11,7 +11,7 @@

 #include "llvm/ADT/StringRef.h"

-#include <stddef.h>
+#include <cstddef>
 #include <string>
 #include <vector>

--- a/lldb/include/lldb/Utility/Timer.h
+++ b/lldb/include/lldb/Utility/Timer.h
@ -12,7 +12,7 @@
 #include "lldb/lldb-defines.h"
 #include "llvm/Support/Chrono.h"
 #include <atomic>
-#include <stdint.h>
+#include <cstdint>

 namespace lldb_private {
 class Stream;
--- a/lldb/include/lldb/Utility/UUID.h
+++ b/lldb/include/lldb/Utility/UUID.h
@ -12,8 +12,8 @@
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Support/Endian.h"
-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>
 #include <string>

 namespace lldb_private {
--- a/lldb/include/lldb/Utility/VMRange.h
+++ b/lldb/include/lldb/Utility/VMRange.h
@ -12,8 +12,8 @@
 #include "lldb/lldb-types.h"
 #include "llvm/Support/raw_ostream.h"

-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>
 #include <vector>

 namespace lldb_private {
--- a/lldb/include/lldb/lldb-types.h
+++ b/lldb/include/lldb/lldb-types.h
@ -12,7 +12,7 @@
 #include "lldb/lldb-enumerations.h"
 #include "lldb/lldb-forward.h"

-#include <stdint.h>
+#include <cstdint>

 // All host systems must define:
 //  lldb::thread_t          The native thread type for spawned threads on the
--- a/lldb/source/API/SBDeclaration.cpp
+++ b/lldb/source/API/SBDeclaration.cpp
@ -14,7 +14,7 @@
 #include "lldb/Host/PosixApi.h"
 #include "lldb/Utility/Stream.h"

-#include <limits.h>
+#include <climits>

 using namespace lldb;
 using namespace lldb_private;
--- a/lldb/source/API/SBError.cpp
+++ b/lldb/source/API/SBError.cpp
@ -12,7 +12,7 @@
 #include "lldb/API/SBStream.h"
 #include "lldb/Utility/Status.h"

-#include <stdarg.h>
+#include <cstdarg>

 using namespace lldb;
 using namespace lldb_private;
--- a/lldb/source/API/SBFileSpec.cpp
+++ b/lldb/source/API/SBFileSpec.cpp
@ -17,8 +17,8 @@

 #include "llvm/ADT/SmallString.h"

-#include <inttypes.h>
-#include <limits.h>
+#include <cinttypes>
+#include <climits>

 using namespace lldb;
 using namespace lldb_private;
--- a/lldb/source/API/SBFileSpecList.cpp
+++ b/lldb/source/API/SBFileSpecList.cpp
@ -16,7 +16,7 @@
 #include "lldb/Utility/FileSpec.h"
 #include "lldb/Utility/Stream.h"

-#include <limits.h>
+#include <climits>

 using namespace lldb;
 using namespace lldb_private;
--- a/lldb/source/API/SBLineEntry.cpp
+++ b/lldb/source/API/SBLineEntry.cpp
@ -14,7 +14,7 @@
 #include "lldb/Symbol/LineEntry.h"
 #include "lldb/Utility/StreamString.h"

-#include <limits.h>
+#include <climits>

 using namespace lldb;
 using namespace lldb_private;
--- a/lldb/source/API/SBProcess.cpp
+++ b/lldb/source/API/SBProcess.cpp
@ -9,7 +9,7 @@
 #include "lldb/API/SBProcess.h"
 #include "SBReproducerPrivate.h"

-#include <inttypes.h>
+#include <cinttypes>

 #include "lldb/lldb-defines.h"
 #include "lldb/lldb-types.h"
--- a/lldb/source/API/SBQueue.cpp
+++ b/lldb/source/API/SBQueue.cpp
@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//

-#include <inttypes.h>
+#include <cinttypes>

 #include "SBReproducerPrivate.h"
 #include "lldb/API/SBQueue.h"
--- a/Show More
+++ b/Show More