Specify __cdecl on wmain, as required by x86 (fixes catchorg#2486).

davidmatson · Jul 25, 2022 · b3737c0 · b3737c0
1 parent 20d413b
commit b3737c0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/docs/own-main.md b/docs/own-main.md
@@ -23,7 +23,7 @@ If you just need to have code that executes before and/ or after Catch this is t
 #define CATCH_CONFIG_RUNNER
 #include "catch.hpp"
 
-int main( int argc, char* argv[] ) {
+extern "C" __cdecl int main( int argc, char* argv[] ) {
   // global setup...
 
   int result = Catch::Session().run( argc, argv );

diff --git a/include/internal/catch_default_main.hpp b/include/internal/catch_default_main.hpp
@@ -15,7 +15,7 @@
 
 #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 __cdecl wmain (int argc, wchar_t * argv[], wchar_t * []) {
 #else
 // Standard C/C++ main entry point
 int main (int argc, char * argv[]) {