Index: runtime/platform/globals.h |
diff --git a/runtime/platform/globals.h b/runtime/platform/globals.h |
index 0b8899484a0c8da3cb746e81d75ba964f000fa00..58cb7eda5d5e8b6c4b9439c7c8969a9deed75975 100644 |
--- a/runtime/platform/globals.h |
+++ b/runtime/platform/globals.h |
@@ -46,11 +46,11 @@ |
#define UNICODE |
#endif |
-#include <windows.h> |
-#include <winsock2.h> |
#include <Rpc.h> |
-#include <shellapi.h> |
#include <VersionHelpers.h> |
+#include <shellapi.h> |
+#include <windows.h> |
+#include <winsock2.h> |
#endif // defined(_WIN32) |
#if !defined(_WIN32) |
@@ -71,8 +71,8 @@ |
#if defined(_WIN32) |
#include "platform/c99_support_win.h" |
-#include "platform/inttypes_support_win.h" |
#include "platform/floating_point_win.h" |
+#include "platform/inttypes_support_win.h" |
#endif // defined(_WIN32) |
#include "platform/math.h" |
@@ -118,7 +118,6 @@ |
#error Automatic target os detection failed. |
#endif |
- |
// Setup product, release or debug build related macros. |
#if defined(PRODUCT) && defined(DEBUG) |
#error Both PRODUCT and DEBUG defined. |
@@ -360,7 +359,6 @@ typedef simd128_value_t fpu_register_t; |
#define ARCH_IS_MULTI_CORE 1 |
#endif |
- |
#if !defined(TARGET_OS_ANDROID) && !defined(TARGET_OS_FUCHSIA) && \ |
!defined(TARGET_OS_MACOS_IOS) && !defined(TARGET_OS_LINUX) && \ |
!defined(TARGET_OS_MACOS) && !defined(TARGET_OS_WINDOWS) |
@@ -383,7 +381,6 @@ typedef simd128_value_t fpu_register_t; |
#endif |
#endif |
- |
// Short form printf format specifiers |
#define Pd PRIdPTR |
#define Pu PRIuPTR |
@@ -399,7 +396,6 @@ typedef simd128_value_t fpu_register_t; |
#define Pp "016" PRIxPTR |
#endif |
- |
// Suffixes for 64-bit integer literals. |
#ifdef _MSC_VER |
#define DART_INT64_C(x) x##I64 |
@@ -553,7 +549,6 @@ inline double MicrosecondsToMilliseconds(int64_t micros) { |
template <typename T> |
static inline void USE(T) {} |
- |
// Use implicit_cast as a safe version of static_cast or const_cast |
// for upcasting in the type hierarchy (i.e. casting a pointer to Foo |
// to a pointer to SuperclassOfFoo or casting a pointer to Foo to |
@@ -576,7 +571,6 @@ inline To implicit_cast(From const& f) { |
return f; |
} |
- |
// Use like this: down_cast<T*>(foo); |
template <typename To, typename From> // use like this: down_cast<T*>(foo); |
inline To down_cast(From* f) { // so we only accept pointers |
@@ -589,7 +583,6 @@ inline To down_cast(From* f) { // so we only accept pointers |
return static_cast<To>(f); |
} |
- |
// The type-based aliasing rule allows the compiler to assume that |
// pointers of different types (for some definition of different) |
// never alias each other. Thus the following code does not work: |
@@ -627,7 +620,6 @@ inline D bit_cast(const S& source) { |
return destination; |
} |
- |
// Similar to bit_cast, but allows copying from types of unrelated |
// sizes. This method was introduced to enable the strict aliasing |
// optimizations of GCC 4.4. Basically, GCC mindlessly relies on |
@@ -642,7 +634,6 @@ inline D bit_copy(const S& source) { |
return destination; |
} |
- |
#if defined(HOST_ARCH_ARM) || defined(HOST_ARCH_ARM64) |
// Similar to bit_copy and bit_cast, but does take the type from the argument. |
template <typename T> |
@@ -653,7 +644,6 @@ static inline T ReadUnaligned(const T* ptr) { |
return value; |
} |
- |
// Similar to bit_copy and bit_cast, but does take the type from the argument. |
template <typename T> |
static inline void StoreUnaligned(T* ptr, T value) { |
@@ -667,7 +657,6 @@ static inline T ReadUnaligned(const T* ptr) { |
return *ptr; |
} |
- |
// Similar to bit_copy and bit_cast, but does take the type from the argument. |
template <typename T> |
static inline void StoreUnaligned(T* ptr, T value) { |
@@ -675,7 +664,6 @@ static inline void StoreUnaligned(T* ptr, T value) { |
} |
#endif // !(HOST_ARCH_ARM || HOST_ARCH_ARM64) |
- |
// On Windows the reentrent version of strtok is called |
// strtok_s. Unify on the posix name strtok_r. |
#if defined(HOST_OS_WINDOWS) |