ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #708 from cxd4/DllMain-with-conflicting-wx 

[Glide64] fixed DllMain conflict against <winbase.h> prototype
This commit is contained in:
zilmar 2015-10-28 14:29:20 +11:00
parent 718b0a974e 8354249a4b
commit 2d808516b3
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Glide64/Main.cpp
View File

@ -1197,7 +1197,7 @@ int DllUnload(void)
void wxSetInstance(HINSTANCE hInstance); void wxSetInstance(HINSTANCE hInstance);
extern "C" int WINAPI DllMain (HINSTANCE hinst, extern "C" int WINAPI DllMain (HINSTANCE hinst,
wxUint32 fdwReason, DWORD fdwReason,
LPVOID /*lpReserved*/) LPVOID /*lpReserved*/)
{ {
sprintf (out_buf, "DllMain (%0p - %d)\n", hinst, fdwReason); sprintf (out_buf, "DllMain (%0p - %d)\n", hinst, fdwReason);