dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

added extern "C" to DllMain so gcc will find it (patch #1255671)

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4218 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2005-08-11 15:56:43 +00:00
parent f9060a4364
commit d0743b2ced
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Contrib/BgImage/BgImage.cpp
View file

@ -637,7 +637,7 @@ int __stdcall myatoi(char *s)
return (int)v; 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; g_hInstance=hInst;
switch (ul_reason_for_call) { switch (ul_reason_for_call) {
case DLL_PROCESS_ATTACH: case DLL_PROCESS_ATTACH:

2
Contrib/Library/TypeLib/TypeLib.cpp
View file

@ -10,7 +10,7 @@
#define NSISFunction(funcname) extern "C" void __declspec(dllexport) funcname(HWND hwndParent, int string_size, char *variables, stack_t **stacktop) #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; return TRUE;
} }

2
Contrib/NSISdl/nsisdl.cpp
View file

@ -190,7 +190,7 @@ static LRESULT CALLBACK ParentWndProc(HWND hwnd, UINT message, WPARAM wParam, LP
return 0; 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; hModule = _hModule;
return TRUE; return TRUE;