From 75559bf1beb2048e7dde4a4b38a79c22d739ec2e Mon Sep 17 00:00:00 2001 From: Stephen White Date: Mon, 27 Aug 2018 10:13:34 -0400 Subject: [PATCH] Change WIN32 to _WIN32. (#260) WIN32 is defined by the SDK, but _WIN32 is defined by the compiler. Since Dawn doesn't necessarily include everywhere dawn.h is included, we should use _WIN32 (which will always be defined). --- src/include/dawn/dawn_export.h | 2 +- src/include/dawn_native/dawn_native_export.h | 2 +- src/include/dawn_wire/dawn_wire_export.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/include/dawn/dawn_export.h b/src/include/dawn/dawn_export.h index 4c6db97d93..d00c8fdb85 100644 --- a/src/include/dawn/dawn_export.h +++ b/src/include/dawn/dawn_export.h @@ -15,7 +15,7 @@ #ifndef DAWN_EXPORT_H_ #define DAWN_EXPORT_H_ -#if defined(WIN32) +#if defined(_WIN32) # if defined(DAWN_IMPLEMENTATION) # define DAWN_EXPORT __declspec(dllexport) # else diff --git a/src/include/dawn_native/dawn_native_export.h b/src/include/dawn_native/dawn_native_export.h index f28ff85fda..f258167954 100644 --- a/src/include/dawn_native/dawn_native_export.h +++ b/src/include/dawn_native/dawn_native_export.h @@ -15,7 +15,7 @@ #ifndef DAWNNATIVE_EXPORT_H_ #define DAWNNATIVE_EXPORT_H_ -#if defined(WIN32) +#if defined(_WIN32) # if defined(DAWN_NATIVE_IMPLEMENTATION) # define DAWN_NATIVE_EXPORT __declspec(dllexport) # else diff --git a/src/include/dawn_wire/dawn_wire_export.h b/src/include/dawn_wire/dawn_wire_export.h index 327c58ea43..d22376266d 100644 --- a/src/include/dawn_wire/dawn_wire_export.h +++ b/src/include/dawn_wire/dawn_wire_export.h @@ -15,7 +15,7 @@ #ifndef DAWNWIRE_EXPORT_H_ #define DAWNWIRE_EXPORT_H_ -#if defined(WIN32) +#if defined(_WIN32) # if defined(DAWN_WIRE_IMPLEMENTATION) # define DAWN_WIRE_EXPORT __declspec(dllexport) # else