Commit8f5e419

committed

Revert "Use workaround of __builtin_setjmp only on MINGW on MSVCRT"

This reverts commitc313fa4.This is found to cause issues on x86_64 Windows even when using UCRT.Discussion:https://postgr.es/m/3312149.1744001936@sss.pgh.pa.us

1 parent8ce7948 commit8f5e419Copy full SHA for 8f5e419

File tree

-5

lines changed

-5

lines changed

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1326,19 +1326,19 @@ extern intfdatasync(int fildes);`
`1326`	`1326`	`/*`
`1327`	`1327`	`* When there is no sigsetjmp, its functionality is provided by plain`
`1328`	`1328`	`* setjmp. We now support the case only on Windows. However, it seems`
`1329`		`- * that MinGW-64 has some longstanding issues in its setjmp support when`
`1330`		`- *building with MSVCRT,so on that toolchain we cheat and use gcc's builtins.`
	`1329`	`+ * that MinGW-64 has some longstanding issues in its setjmp support,`
	`1330`	`+ * so on that toolchain we cheat and use gcc's builtins.`
`1331`	`1331`	`*/`
`1332`	`1332`	`#ifdefWIN32`
`1333`		`-#if defined(__MINGW64__)&& !defined(_UCRT)`
	`1333`	`+#ifdef__MINGW64__`
`1334`	`1334`	`typedefintptr_tsigjmp_buf[5];`
`1335`	`1335`	`#definesigsetjmp(x,y) __builtin_setjmp(x)`
`1336`	`1336`	`#definesiglongjmp __builtin_longjmp`
`1337`		`-#else/* !defined(__MINGW64__) \|\| defined(_UCRT) */`
	`1337`	`+#else/* !__MINGW64__ */`
`1338`	`1338`	`#definesigjmp_buf jmp_buf`
`1339`	`1339`	`#definesigsetjmp(x,y) setjmp(x)`
`1340`	`1340`	`#definesiglongjmp longjmp`
`1341`		`-#endif/defined(__MINGW64__) && !defined(_UCRT) /`
	`1341`	`+#endif/* __MINGW64__ */`
`1342`	`1342`	`#endif/* WIN32 */`
`1343`	`1343`
`1344`	`1344`	`/* /port compatibility functions */`

Comments

(0)