inject: Fix MinGW cross-compilation errors on Ubuntu 20.04.

jrfonseca · jrfonseca · commit 1aa83915bfc3 · 2020-09-18T14:11:32.000+01:00
diff --git a/inject/injectee_iat.cpp b/inject/injectee_iat.cpp
@@ -90,13 +90,17 @@ _assert(const char *_Message, const char *_File, unsigned _Line)
 }
 
 
+#ifndef __MINGW32__
+
 EXTERN_C void
 _wassert(const wchar_t * _Message, const wchar_t *_File, unsigned _Line)
 {
     debugPrintf("Assertion failed: %S, file %S, line %u\n", _Message, _File, _Line);
     TerminateProcess(GetCurrentProcess(), 1);
 }
 
+#endif /* !__MINGW32__ */
+
 
 static HMODULE WINAPI
 MyLoadLibraryA(LPCSTR lpLibFileName);
diff --git a/inject/injectee_mhook.cpp b/inject/injectee_mhook.cpp
@@ -144,13 +144,17 @@ _assert(const char *_Message, const char *_File, unsigned _Line)
 }
 
 
+#ifndef __MINGW32__
+
 EXTERN_C void
 _wassert(const wchar_t * _Message, const wchar_t *_File, unsigned _Line)
 {
     debugPrintf("Assertion failed: %S, file %S, line %u\n", _Message, _File, _Line);
     TerminateProcess(GetCurrentProcess(), 1);
 }
 
+#endif /* !__MINGW32__ */
+
 
 static void
 MyCreateProcessCommon(BOOL bRet,

Original file line number	Diff line number	Diff line change
`@@ -90,13 +90,17 @@ _assert(const char _Message, const char _File, unsigned _Line)`
`90`	`90`	`}`
`91`	`91`
`92`	`92`
	`93`	`+#ifndef __MINGW32__`
	`94`	`+`
`93`	`95`	`EXTERN_C void`
`94`	`96`	`_wassert(const wchar_t * _Message, const wchar_t *_File, unsigned _Line)`
`95`	`97`	`{`
`96`	`98`	`debugPrintf("Assertion failed: %S, file %S, line %u\n", _Message, _File, _Line);`
`97`	`99`	`TerminateProcess(GetCurrentProcess(), 1);`
`98`	`100`	`}`
`99`	`101`
	`102`	`+#endif /* !__MINGW32__ */`
	`103`	`+`
`100`	`104`
`101`	`105`	`static HMODULE WINAPI`
`102`	`106`	`MyLoadLibraryA(LPCSTR lpLibFileName);`
Original file line number	Diff line number	Diff line change
`@@ -144,13 +144,17 @@ _assert(const char _Message, const char _File, unsigned _Line)`
`144`	`144`	`}`
`145`	`145`
`146`	`146`
	`147`	`+#ifndef __MINGW32__`
	`148`	`+`
`147`	`149`	`EXTERN_C void`
`148`	`150`	`_wassert(const wchar_t * _Message, const wchar_t *_File, unsigned _Line)`
`149`	`151`	`{`
`150`	`152`	`debugPrintf("Assertion failed: %S, file %S, line %u\n", _Message, _File, _Line);`
`151`	`153`	`TerminateProcess(GetCurrentProcess(), 1);`
`152`	`154`	`}`
`153`	`155`
	`156`	`+#endif /* !__MINGW32__ */`
	`157`	`+`
`154`	`158`
`155`	`159`	`static void`
`156`	`160`	`MyCreateProcessCommon(BOOL bRet,`