upstream/postgresql
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2026-07-15 12:51:05 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make PLy_elog() use pg_integer_constant_p().

Browse source 
This macro is supposed to work like ereport().  But when
59c2f03d1 adjusted ereport() to be more MSVC-friendly,
it missed updating this copy of the logic.

Discussion: https://postgr.es/m/754534.1783264708@sss.pgh.pa.us
Backpatch-through: 19
This commit is contained in:
Tom Lane 2026-07-06 13:48:42 -04:00
parent 67cf73ddbe
commit 017499a50f
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/pl/plpython/plpy_elog.h
View file

@ -17,14 +17,14 @@ extern PyObject *PLy_exc_spi_error;
*
* See comments at elog() about the compiler hinting.
*/
#ifdef HAVE__BUILTIN_CONSTANT_P
#ifdef HAVE_PG_INTEGER_CONSTANT_P
#define PLy_elog(elevel, ...) \
do { \
PLy_elog_impl(elevel, __VA_ARGS__); \
if (__builtin_constant_p(elevel) && (elevel) >= ERROR) \
if (pg_integer_constant_p(elevel) && (elevel) >= ERROR) \
pg_unreachable(); \
} while(0)
#else /* !HAVE__BUILTIN_CONSTANT_P */
#else /* !HAVE_PG_INTEGER_CONSTANT_P */
#define PLy_elog(elevel, ...) \
do { \
const int elevel_ = (elevel); \
@ -32,7 +32,7 @@ extern PyObject *PLy_exc_spi_error;
if (elevel_ >= ERROR) \
pg_unreachable(); \
} while(0)
#endif /* HAVE__BUILTIN_CONSTANT_P */
#endif /* HAVE_PG_INTEGER_CONSTANT_P */
extern PGDLLEXPORT void PLy_elog_impl(int elevel, const char *fmt, ...) pg_attribute_printf(2, 3);