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
This commit is contained in:
João Reis authored and Julien Gilli committed 2015-07-23 11:08:32 -07:00
1 parent 16bcd68dc5
commit e192f61514
2 files changed
+3 -3

No files matched your search

@@ -6,7 +6,7 @@
#include <wcautil.h> #include <wcautil.h>
UINT WINAPI BroadcastEnvironmentUpdate(MSIHANDLE hInstall) { extern "C" UINT WINAPI BroadcastEnvironmentUpdate(MSIHANDLE hInstall) {
HRESULT hr = S_OK; HRESULT hr = S_OK;
UINT er = ERROR_SUCCESS; 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) { switch (ulReason) {
case DLL_PROCESS_ATTACH: case DLL_PROCESS_ATTACH:
WcaGlobalInitialize(hInst); WcaGlobalInitialize(hInst);
+1 -1
View File
@@ -169,7 +169,7 @@
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="custom_actions.c"> <ClCompile Include="custom_actions.cc">
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>