sb5.40: detect if USE_NO_MINGW_SETJMP_TWO_ARGS is needed

dk · Aug 15, 2024 · 26f077e · 26f077e
1 parent 098ffdb
commit 26f077e
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 2 deletions.
diff --git a/Makefile.PL b/Makefile.PL
@@ -925,6 +925,37 @@ GLIBC
 	$DEFINES{HAS_GLIBC} = 1 if $rc;
 }
 
+sub find_setjmp
+{
+	printlog "Checking for setjmp... ";
+	my $response = 'no';
+	my $rc = compile( <<'SET1');
+#ifdef __MINGW32__
+#	include <setjmp.h>
+#	include <intrin.h>
+#endif
+int main() { return 0; }
+SET1
+	if ( !$rc ) {
+		$rc = compile( <<'SET2');
+#include <setjmp.h>
+#ifdef __MINGW32__
+#	include <setjmp.h>
+#	define USE_NO_MINGW_SETJMP_TWO_ARGS
+#	include <intrin.h>
+#endif
+int main() { return 0; }
+SET2
+		if ( $rc ) {
+			$DEFINES{USE_NO_MINGW_SETJMP_TWO_ARGS} = 1;
+			$response = 'two-args hack';
+		}
+	} else {
+		$response = 'yes';
+	}
+	printlog "$response\n";
+}
+
 sub setup_compiler
 {
 	printlog "Compiler: $compiler_type\n";
@@ -1136,6 +1167,7 @@ sub setup_defines
 	}
 	find_inline();
 	find_glibc;
+	find_setjmp if $^O =~ /win32/i;
 }
 
 sub setup_dl_loadflags

diff --git a/img/codec_jpeg.c b/img/codec_jpeg.c
@@ -7,7 +7,6 @@ and _setjmp is not equivaluent to setjmp anymore
 #pragma push_macro("setjmp")
 #pragma push_macro("longjmp")
 #endif
-#define USE_NO_MINGW_SETJMP_TWO_ARGS
 #include "img.h"
 #include "img_conv.h"
 #include "Image.h"

diff --git a/img/codec_png.c b/img/codec_png.c
@@ -7,7 +7,6 @@ and _setjmp is not equivaluent to setjmp anymore
 #pragma push_macro("setjmp")
 #pragma push_macro("longjmp")
 #endif
-#define USE_NO_MINGW_SETJMP_TWO_ARGS
 #include "generic/config.h"
 #define Z_PREFIX
 #include <png.h>