mirror of
				https://github.com/postgres/postgres.git
				synced 2025-11-03 09:13:20 +03:00 
			
		
		
		
	Remove test for VA_ARGS, implied by C99.
This simplifies logic / reduces duplication in a few headers. Author: Andres Freund Discussion: https://postgr.es/m/97d4b165-192d-3605-749c-f614a0c4e783@2ndquadrant.com
This commit is contained in:
		@@ -758,9 +758,6 @@
 | 
			
		||||
/* Define to 1 if your compiler understands _Static_assert. */
 | 
			
		||||
#undef HAVE__STATIC_ASSERT
 | 
			
		||||
 | 
			
		||||
/* Define to 1 if your compiler understands __VA_ARGS__ in macros. */
 | 
			
		||||
#undef HAVE__VA_ARGS
 | 
			
		||||
 | 
			
		||||
/* Define to 1 if you have the `__strtoll' function. */
 | 
			
		||||
#undef HAVE___STRTOLL
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -601,9 +601,6 @@
 | 
			
		||||
/* Define to 1 if your compiler understands _Static_assert. */
 | 
			
		||||
/* #undef HAVE__STATIC_ASSERT */
 | 
			
		||||
 | 
			
		||||
/* Define to 1 if your compiler understands __VA_ARGS__ in macros. */
 | 
			
		||||
#define HAVE__VA_ARGS 1
 | 
			
		||||
 | 
			
		||||
/* Define to the appropriate printf length modifier for 64-bit ints. */
 | 
			
		||||
#define INT64_MODIFIER "ll"
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -207,9 +207,8 @@ extern int	getinternalerrposition(void);
 | 
			
		||||
 *		elog(ERROR, "portal \"%s\" not found", stmt->portalname);
 | 
			
		||||
 *----------
 | 
			
		||||
 */
 | 
			
		||||
#ifdef HAVE__VA_ARGS
 | 
			
		||||
/*
 | 
			
		||||
 * If we have variadic macros, we can give the compiler a hint about the
 | 
			
		||||
 * Using variadic macros, we can give the compiler a hint about the
 | 
			
		||||
 * call not returning when elevel >= ERROR.  See comments for ereport().
 | 
			
		||||
 * Note that historically elog() has called elog_start (which saves errno)
 | 
			
		||||
 * before evaluating "elevel", so we preserve that behavior here.
 | 
			
		||||
@@ -236,11 +235,6 @@ extern int	getinternalerrposition(void);
 | 
			
		||||
		} \
 | 
			
		||||
	} while(0)
 | 
			
		||||
#endif							/* HAVE__BUILTIN_CONSTANT_P */
 | 
			
		||||
#else							/* !HAVE__VA_ARGS */
 | 
			
		||||
#define elog  \
 | 
			
		||||
	elog_start(__FILE__, __LINE__, PG_FUNCNAME_MACRO), \
 | 
			
		||||
	elog_finish
 | 
			
		||||
#endif							/* HAVE__VA_ARGS */
 | 
			
		||||
 | 
			
		||||
extern void elog_start(const char *filename, int lineno, const char *funcname);
 | 
			
		||||
extern void elog_finish(int elevel, const char *fmt,...) pg_attribute_printf(2, 3);
 | 
			
		||||
 
 | 
			
		||||
@@ -15,7 +15,6 @@ extern PyObject *PLy_exc_spi_error;
 | 
			
		||||
 *
 | 
			
		||||
 * See comments at elog() about the compiler hinting.
 | 
			
		||||
 */
 | 
			
		||||
#ifdef HAVE__VA_ARGS
 | 
			
		||||
#ifdef HAVE__BUILTIN_CONSTANT_P
 | 
			
		||||
#define PLy_elog(elevel, ...) \
 | 
			
		||||
	do { \
 | 
			
		||||
@@ -32,9 +31,6 @@ extern PyObject *PLy_exc_spi_error;
 | 
			
		||||
			pg_unreachable(); \
 | 
			
		||||
	} while(0)
 | 
			
		||||
#endif							/* HAVE__BUILTIN_CONSTANT_P */
 | 
			
		||||
#else							/* !HAVE__VA_ARGS */
 | 
			
		||||
#define PLy_elog PLy_elog_impl
 | 
			
		||||
#endif							/* HAVE__VA_ARGS */
 | 
			
		||||
 | 
			
		||||
extern void PLy_elog_impl(int elevel, const char *fmt,...) pg_attribute_printf(2, 3);
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user