Skip to content

rename preprocessor #2644

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
akrantz merged 1 commit into from
Jun 19, 2019
Merged

rename preprocessor #2644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions vnext/Chakra/ChakraHelpers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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";
Expand Down
4 changes: 2 additions & 2 deletions vnext/Chakra/ChakraJsiRuntime_core.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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); };
Expand Down
2 changes: 1 addition & 1 deletion vnext/ReactUWP/ReactUWP.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
REACTWINDOWS_BUILD - building with REACTWINDOWS_API as dll exports
OLD_CPPWINRT is a workaround to make target version to 19H1
-->
<PreprocessorDefinitions Condition="'$(CHAKRACOREUWP)'=='true'">CHAKRACORE;CHAKRACOREUWP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(CHAKRACOREUWP)'=='true'">CHAKRACORE;CHAKRACORE_UWP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(CHAKRACOREUWP)'!='true'">USE_EDGEMODE_JSRT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<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)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
Expand Down