diff options
| author | João Reis <reis@janeasystems.com> | 2015-07-21 21:39:15 +0100 |
|---|---|---|
| committer | Julien Gilli <julien.gilli@joyent.com> | 2015-07-23 11:08:32 -0700 |
| commit | e192f61514cd1500de895cb10128d412f842d7d0 (patch) | |
| tree | e60708b92e020ce95a99f87475baec38c1231e24 | |
| parent | 16bcd68dc5f449c331499ced22aa626dbb2cdefc (diff) | |
| download | node-e192f61514cd1500de895cb10128d412f842d7d0.tar.gz | |
win: fix custom actions for WiX older than 3.9
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
| -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 5e7d617f3..9a23d5574 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 ae82905cd..3716f07ff 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> |