From 98799b0c0e486ce35db00b131c4c69ac9b0576b0 Mon Sep 17 00:00:00 2001 From: Stephen Crain Date: Tue, 18 Jun 2019 21:33:38 -0700 Subject: [PATCH] rename preprocessor --- vnext/Chakra/ChakraHelpers.cpp | 4 ++-- vnext/Chakra/ChakraJsiRuntime_core.cpp | 4 ++-- vnext/ReactUWP/ReactUWP.vcxproj | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/vnext/Chakra/ChakraHelpers.cpp b/vnext/Chakra/ChakraHelpers.cpp index 98bd91fc6c7..fda7f3fe436 100644 --- a/vnext/Chakra/ChakraHelpers.cpp +++ b/vnext/Chakra/ChakraHelpers.cpp @@ -49,7 +49,7 @@ bool fwrite(const T& val, FILE* file) noexcept return fwrite(&val, 1, file) == 1; } -#if !defined(CHAKRACOREUWP) +#if !defined(CHAKRACORE_UWP) struct FileVersionInfoResource { uint16_t len; @@ -74,7 +74,7 @@ class ChakraVersionInfo bool initialize() noexcept { -#if !defined(CHAKRACOREUWP) +#if !defined(CHAKRACORE_UWP) // This code is win32 only at the moment. We will need to change this // line if we want to support UWP. constexpr wchar_t chakraDllName[] = L"ChakraCore.dll"; diff --git a/vnext/Chakra/ChakraJsiRuntime_core.cpp b/vnext/Chakra/ChakraJsiRuntime_core.cpp index 4eaba820d7d..285d09dbee1 100644 --- a/vnext/Chakra/ChakraJsiRuntime_core.cpp +++ b/vnext/Chakra/ChakraJsiRuntime_core.cpp @@ -179,7 +179,7 @@ void ChakraJsiRuntime::setupNativePromiseContinuation() noexcept{ } } -#if !defined(CHAKRACOREUWP) +#if !defined(CHAKRACORE_UWP) // This is very wierd. This should match with the definition of VS_VERSIONINFO as defined in https://docs.microsoft.com/en-us/windows/desktop/menurc/vs-versioninfo // I can't find a way to include the actual definition of VS_VERSIONINFO // TODO :: Re-evaluate this strategy. @@ -199,7 +199,7 @@ struct FileVersionInfoResource { /*static*/ void ChakraJsiRuntime::initRuntimeVersion() noexcept { // This code is win32 only at the moment. We will need to change this // line if we want to support UWP. -#if !defined(CHAKRACOREUWP) +#if !defined(CHAKRACORE_UWP) constexpr wchar_t chakraDllName[] = L"ChakraCore.dll"; auto freeLibraryWrapper = [](void* p) { FreeLibrary((HMODULE)p); }; diff --git a/vnext/ReactUWP/ReactUWP.vcxproj b/vnext/ReactUWP/ReactUWP.vcxproj index 8abcc2ba14a..42da9cba50b 100644 --- a/vnext/ReactUWP/ReactUWP.vcxproj +++ b/vnext/ReactUWP/ReactUWP.vcxproj @@ -79,7 +79,7 @@ REACTWINDOWS_BUILD - building with REACTWINDOWS_API as dll exports OLD_CPPWINRT is a workaround to make target version to 19H1 --> - CHAKRACORE;CHAKRACOREUWP;%(PreprocessorDefinitions) + CHAKRACORE;CHAKRACORE_UWP;%(PreprocessorDefinitions) USE_EDGEMODE_JSRT;%(PreprocessorDefinitions) OLD_CPPWINRT;REACTWINDOWS_BUILD;RN_PLATFORM=uwp;NOMINMAX;FOLLY_NO_CONFIG;RN_EXPORT=;JSI_EXPORT=;WIN32=0;WINRT=1;NOJSC;_HAS_AUTO_PTR_ETC;%(PreprocessorDefinitions) $(ReactNativeWindowsDir);$(ReactNativeWindowsDir)Pch;$(ReactNativeWindowsDir)ReactUWP\GeneratedWinmdHeader;$(ReactNativeWindowsDir)ReactWindowsCore;$(ReactNativeWindowsDir)include\ReactWindowsCore;$(ReactNativeWindowsDir)include\ReactUWP;$(YogaDir);$(ReactNativeDir)\ReactCommon;$(ReactNativeWindowsDir)include;$(ReactNativeWindowsDir)stubs;$(ReactNativeWindowsDir)Shared;$(FollyDir);%(AdditionalIncludeDirectories)