diff options
| author | João Reis <reis@janeasystems.com> | 2015-07-21 21:39:15 +0100 |
|---|---|---|
| committer | João Reis <reis@janeasystems.com> | 2015-08-24 12:06:15 +0100 |
| commit | bce1aea4253b124cbeafb913395ff5db3678d225 (patch) | |
| tree | d79960c27ba8bca1bbd7e2fb5cb32cbf53279b00 /tools/msvs | |
| parent | 0acc9b27958375b0fae27ec292b6e18aae5a2a19 (diff) | |
| download | android-node-v8-bce1aea4253b124cbeafb913395ff5db3678d225.tar.gz android-node-v8-bce1aea4253b124cbeafb913395ff5db3678d225.tar.bz2 android-node-v8-bce1aea4253b124cbeafb913395ff5db3678d225.zip | |
win: fix custom actions for WiX older than 3.9
This is a port of joyent/node@e192f61514cd1500de895cb10128d412f842d7d0 .
Original commit message:
Older WiX versions included a header with extern "C" declaration,
hence the custom action source must be C++.
Reviewed-By: João Reis <reis@janeasystems.com>
PR-URL: https://github.com/joyent/node/pull/25569
PR-URL: https://github.com/nodejs/node/pull/2365
Reviewed-By: Alexis Campailla <alexis@janeasystems.com>
Diffstat (limited to 'tools/msvs')
| -rw-r--r-- | tools/msvs/msi/custom_actions.cc (renamed from tools/msvs/msi/custom_actions.c) | 4 | ||||
| -rw-r--r-- | tools/msvs/msi/custom_actions.vcxproj | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/msvs/msi/custom_actions.c b/tools/msvs/msi/custom_actions.cc index 5e7d617f38..9a23d55747 100644 --- a/tools/msvs/msi/custom_actions.c +++ b/tools/msvs/msi/custom_actions.cc @@ -6,7 +6,7 @@ #include <wcautil.h> -UINT WINAPI BroadcastEnvironmentUpdate(MSIHANDLE hInstall) { +extern "C" UINT WINAPI BroadcastEnvironmentUpdate(MSIHANDLE hInstall) { HRESULT hr = S_OK; UINT er = ERROR_SUCCESS; @@ -27,7 +27,7 @@ LExit: } -BOOL WINAPI DllMain(HINSTANCE hInst, ULONG ulReason, VOID* dummy) { +extern "C" BOOL WINAPI DllMain(HINSTANCE hInst, ULONG ulReason, VOID* dummy) { switch (ulReason) { case DLL_PROCESS_ATTACH: WcaGlobalInitialize(hInst); diff --git a/tools/msvs/msi/custom_actions.vcxproj b/tools/msvs/msi/custom_actions.vcxproj index ae82905cd4..3716f07ff6 100644 --- a/tools/msvs/msi/custom_actions.vcxproj +++ b/tools/msvs/msi/custom_actions.vcxproj @@ -169,7 +169,7 @@ </Link> </ItemDefinitionGroup> <ItemGroup> - <ClCompile Include="custom_actions.c"> + <ClCompile Include="custom_actions.cc"> </ClCompile> </ItemGroup> <ItemGroup> |