mirror of
				https://github.com/catchorg/Catch2.git
				synced 2025-11-04 14:09:33 +01:00 
			
		
		
		
	Explicitly specify __cdecl on main/wmain for MSVC (#2487)
Fixes #2486 Co-authored-by: Martin Hořeňovský <martin.horenovsky@gmail.com>
This commit is contained in:
		@@ -13,12 +13,20 @@
 | 
			
		||||
 | 
			
		||||
#ifndef __OBJC__
 | 
			
		||||
 | 
			
		||||
#ifndef CATCH_INTERNAL_CDECL
 | 
			
		||||
#ifdef _MSC_VER
 | 
			
		||||
#define CATCH_INTERNAL_CDECL __cdecl
 | 
			
		||||
#else
 | 
			
		||||
#define CATCH_INTERNAL_CDECL
 | 
			
		||||
#endif
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#if defined(CATCH_CONFIG_WCHAR) && defined(CATCH_PLATFORM_WINDOWS) && defined(_UNICODE) && !defined(DO_NOT_USE_WMAIN)
 | 
			
		||||
// Standard C/C++ Win32 Unicode wmain entry point
 | 
			
		||||
extern "C" int wmain (int argc, wchar_t * argv[], wchar_t * []) {
 | 
			
		||||
extern "C" int CATCH_INTERNAL_CDECL wmain (int argc, wchar_t * argv[], wchar_t * []) {
 | 
			
		||||
#else
 | 
			
		||||
// Standard C/C++ main entry point
 | 
			
		||||
int main (int argc, char * argv[]) {
 | 
			
		||||
int CATCH_INTERNAL_CDECL main (int argc, char * argv[]) {
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
    return Catch::Session().run( argc, argv );
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user