From d0743b2ced0f45b8b70624ca42a16d6c1af489f0 Mon Sep 17 00:00:00 2001 From: kichik Date: Thu, 11 Aug 2005 15:56:43 +0000 Subject: [PATCH] added extern "C" to DllMain so gcc will find it (patch #1255671) git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4218 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/BgImage/BgImage.cpp | 2 +- Contrib/Library/TypeLib/TypeLib.cpp | 2 +- Contrib/NSISdl/nsisdl.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Contrib/BgImage/BgImage.cpp b/Contrib/BgImage/BgImage.cpp index 5105bee4..0ca57657 100644 --- a/Contrib/BgImage/BgImage.cpp +++ b/Contrib/BgImage/BgImage.cpp @@ -637,7 +637,7 @@ int __stdcall myatoi(char *s) return (int)v; } -BOOL WINAPI DllMain(HINSTANCE hInst, ULONG ul_reason_for_call, LPVOID lpReserved) { +extern "C" BOOL WINAPI DllMain(HINSTANCE hInst, ULONG ul_reason_for_call, LPVOID lpReserved) { g_hInstance=hInst; switch (ul_reason_for_call) { case DLL_PROCESS_ATTACH: diff --git a/Contrib/Library/TypeLib/TypeLib.cpp b/Contrib/Library/TypeLib/TypeLib.cpp index 39a7be1f..e1a401d8 100644 --- a/Contrib/Library/TypeLib/TypeLib.cpp +++ b/Contrib/Library/TypeLib/TypeLib.cpp @@ -10,7 +10,7 @@ #define NSISFunction(funcname) extern "C" void __declspec(dllexport) funcname(HWND hwndParent, int string_size, char *variables, stack_t **stacktop) -BOOL WINAPI DllMain(HANDLE hInst, ULONG ul_reason_for_call, LPVOID lpReserved) { +extern "C" BOOL WINAPI DllMain(HANDLE hInst, ULONG ul_reason_for_call, LPVOID lpReserved) { return TRUE; } diff --git a/Contrib/NSISdl/nsisdl.cpp b/Contrib/NSISdl/nsisdl.cpp index c361f429..8336cb9d 100644 --- a/Contrib/NSISdl/nsisdl.cpp +++ b/Contrib/NSISdl/nsisdl.cpp @@ -190,7 +190,7 @@ static LRESULT CALLBACK ParentWndProc(HWND hwnd, UINT message, WPARAM wParam, LP return 0; } -BOOL APIENTRY DllMain(HINSTANCE _hModule, DWORD ul_reason_for_call, LPVOID lpReserved) +extern "C" BOOL APIENTRY DllMain(HINSTANCE _hModule, DWORD ul_reason_for_call, LPVOID lpReserved) { hModule = _hModule; return TRUE;