From 51a98b984374630ad9f2702a0cba84b55da478d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Reis?= <reis@janeasystems.com>
Date: Tue, 21 Jul 2015 21:39:15 +0100
Subject: [PATCH] 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++.
---
 tools/msvs/msi/{custom_actions.c => custom_actions.cc} | 4 ++--
 tools/msvs/msi/custom_actions.vcxproj                  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename tools/msvs/msi/{custom_actions.c => custom_actions.cc} (83%)

diff --git a/tools/msvs/msi/custom_actions.c b/tools/msvs/msi/custom_actions.cc
similarity index 83%
rename from tools/msvs/msi/custom_actions.c
rename to tools/msvs/msi/custom_actions.cc
index 5e7d617f3879..9a23d5574760 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 @@ UINT WINAPI BroadcastEnvironmentUpdate(MSIHANDLE hInstall) {
 }
 
 
-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 19baeadd558e..4417abc8473a 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>