[vm] Cleanup C99 header includes

Now that MSVC 2013 is required (commit f4824d3), we can simply use C99
headers that are provided [1]. This means we can rely on <stdint.h> to
provide intXX_t and uintXX_t types, and <inttypes.h> to provide PRIxx
macros.

[1] https://devblogs.microsoft.com/cppblog/c99-library-support-in-visual-studio-2013/

Change-Id: I0cc707907f8aca05ae543188cc01e6c50d517f5a
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/107839
Auto-Submit: Matthew Dempsky <[email protected]>
Commit-Queue: Vyacheslav Egorov <[email protected]>
Reviewed-by: Vyacheslav Egorov <[email protected]>

Author: mdempsky

runtime/bin/observatory_assets_empty.cc

@@ -5,13 +5,7 @@
 // This file is linked into the dart executable when it does not have
 // Observatory baked in.
 
-#if defined(_WIN32)
-typedef unsigned __int8 uint8_t;
-#else
-#include <inttypes.h>
 #include <stdint.h>
-#endif
-#include <stddef.h>
 
 namespace dart {
 namespace bin {

runtime/bin/snapshot_empty.cc

@@ -5,17 +5,11 @@
 // This file is linked into the dart executable when it does not have a
 // snapshot linked into it.
 
-#if defined(_WIN32)
-typedef unsigned __int8 uint8_t;
-#else
-#include <inttypes.h>
 #include <stdint.h>
-#endif
-#include <stddef.h>
 
 extern "C" {
-const uint8_t* kDartVmSnapshotData = NULL;
-const uint8_t* kDartVmSnapshotInstructions = NULL;
-const uint8_t* kDartCoreIsolateSnapshotData = NULL;
-const uint8_t* kDartCoreIsolateSnapshotInstructions = NULL;
+const uint8_t* kDartVmSnapshotData = nullptr;
+const uint8_t* kDartVmSnapshotInstructions = nullptr;
+const uint8_t* kDartCoreIsolateSnapshotData = nullptr;
+const uint8_t* kDartCoreIsolateSnapshotInstructions = nullptr;
 }

runtime/bin/snapshot_in.cc

@@ -7,13 +7,7 @@
 // This file is linked into the dart executable when it has a snapshot
 // linked into it.
 
-#if defined(_WIN32)
-typedef unsigned __int8 uint8_t;
-#else
-#include <inttypes.h>
 #include <stdint.h>
-#endif
-#include <stddef.h>
 
 extern "C" {
 

runtime/include/dart_api.h

@@ -15,6 +15,16 @@
  * This reference is generated from the header include/dart_api.h.
  */
 
+/* __STDC_FORMAT_MACROS has to be defined before including <inttypes.h> to
+ * enable platform independent printf format specifiers. */
+#ifndef __STDC_FORMAT_MACROS
+#define __STDC_FORMAT_MACROS
+#endif
+
+#include <assert.h>
+#include <inttypes.h>
+#include <stdbool.h>
+
 #ifdef __cplusplus
 #define DART_EXTERN_C extern "C"
 #else
@@ -24,32 +34,12 @@
 #if defined(__CYGWIN__)
 #error Tool chain and platform not supported.
 #elif defined(_WIN32)
-// Define bool if necessary.
-#ifndef __cplusplus
-typedef unsigned __int8 bool;
-#endif
-// Define integer types.
-typedef signed __int8 int8_t;
-typedef signed __int16 int16_t;
-typedef signed __int32 int32_t;
-typedef signed __int64 int64_t;
-typedef unsigned __int8 uint8_t;
-typedef unsigned __int16 uint16_t;
-typedef unsigned __int32 uint32_t;
-typedef unsigned __int64 uint64_t;
 #if defined(DART_SHARED_LIB)
 #define DART_EXPORT DART_EXTERN_C __declspec(dllexport)
 #else
 #define DART_EXPORT DART_EXTERN_C
 #endif
 #else
-/* __STDC_FORMAT_MACROS has to be defined before including <inttypes.h> to
- * enable platform independent printf format specifiers. */
-#ifndef __STDC_FORMAT_MACROS
-#define __STDC_FORMAT_MACROS
-#endif
-#include <inttypes.h>
-#include <stdbool.h>
 #if __GNUC__ >= 4
 #if defined(DART_SHARED_LIB)
 #define DART_EXPORT                                                            \
@@ -70,8 +60,6 @@ typedef unsigned __int64 uint64_t;
 #define DART_WARN_UNUSED_RESULT
 #endif
 
-#include <assert.h>
-
 /*
  * =======
  * Handles

runtime/platform/globals.h

@@ -62,24 +62,23 @@
 
 #if !defined(_WIN32)
 #include <arpa/inet.h>
-#include <inttypes.h>
-#include <stdint.h>
 #include <unistd.h>
 #endif  // !defined(_WIN32)
 
 #include <float.h>
+#include <inttypes.h>
 #include <limits.h>
 #include <math.h>
 #include <stdarg.h>
 #include <stddef.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
 
 #if defined(_WIN32)
 #include "platform/floating_point_win.h"
-#include "platform/inttypes_support_win.h"
 #endif  // defined(_WIN32)
 
 #if !defined(_WIN32)

runtime/platform/inttypes_support_win.h

@@ -22,7 +22,6 @@ platform_sources = [
   "growable_array.h",
   "hashmap.cc",
   "hashmap.h",
-  "inttypes_support_win.h",
   "memory_sanitizer.h",
   "safe_stack.h",
   "signal_blocker.h",

runtime/platform/platform_sources.gni

@@ -85,13 +85,7 @@ def WriteCCFile(output_file,
 ''' % date.today().year)
     out.write('''
 
-#if defined(_WIN32)
-typedef unsigned __int8 uint8_t;
-#else
-#include <inttypes.h>
 #include <stdint.h>
-#endif
-#include <stddef.h>
 
 ''')
     out.write('namespace %s {\n' % outer_namespace)