git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

Use workaround of __builtin_setjmp only on MINGW on MSVCRT

author Andrew Dunstan <andrew@dunslane.net>

Tue, 1 Apr 2025 20:24:59 +0000 (16:24 -0400)

committer Andrew Dunstan <andrew@dunslane.net>

Tue, 1 Apr 2025 20:24:59 +0000 (16:24 -0400)

MSVCRT is not present Windows/ARM64 and the workaround is not
necessary on any UCRT based toolchain.

Author: Lars Kanis <lars@greiz-reinsdorf.de>

Discussion: https://postgr.es/m/CAHXCYb2OjNHtoGVKyXtXmw4B3bUXwJX6M-Lcp1KcMCRUMLOocA@mail.gmail.com

src/include/c.h patch | blob | blame | history

diff --git a/src/include/c.h b/src/include/c.h

index 8cdc16a0f4a9b4d2a8638981a9e574405846cd3a..94697aab428fcb0cd37c215cbee5f01efafe638e 100644 (file)

--- a/src/include/c.h

+++ b/src/include/c.h

@@ -1326,19 +1326,19 @@ extern int fdatasync(int fildes);

* When there is no sigsetjmp, its functionality is provided by plain

* setjmp. We now support the case only on Windows. However, it seems

- * that MinGW-64 has some longstanding issues in its setjmp support,

- * so on that toolchain we cheat and use gcc's builtins.

+ * that MinGW-64 has some longstanding issues in its setjmp support when

+ * building with MSVCRT, so on that toolchain we cheat and use gcc's builtins.

#ifdef WIN32

-#ifdef __MINGW64__

+#if defined(__MINGW64__) && !defined(_UCRT)

typedef intptr_t sigjmp_buf[5];

#define sigsetjmp(x,y) __builtin_setjmp(x)

#define siglongjmp __builtin_longjmp

-#else /* !__MINGW64__ */

+#else /* !defined(__MINGW64__) || defined(_UCRT) */

#define sigjmp_buf jmp_buf

#define sigsetjmp(x,y) setjmp(x)

#define siglongjmp longjmp

-#endif /* __MINGW64__ */

+#endif /* defined(__MINGW64__) && !defined(_UCRT) */

#endif /* WIN32 */

/* /port compatibility functions */

This is the main PostgreSQL git repository.

RSS Atom