From f46baf601d889b374ba5e5f4b8280fee5aa19a7f Mon Sep 17 00:00:00 2001 From: Alvaro Herrera Date: Tue, 9 Oct 2012 11:10:10 -0300 Subject: [PATCH] Rename USE_INLINE to PG_USE_INLINE The former name was too likely to conflict with symbols from external headers; and, as seen in recent buildfarm failures in member spoonbill, it has now happened at least in plpython. --- config/c-compiler.m4 | 4 ++-- configure | 2 +- src/include/c.h | 6 +++--- src/include/nodes/pg_list.h | 8 ++++---- src/include/pg_config.h.in | 8 ++++---- src/include/pg_config.h.win32 | 4 ++-- src/include/utils/palloc.h | 11 +++++------ src/include/utils/sortsupport.h | 8 ++++---- 8 files changed, 25 insertions(+), 26 deletions(-) mode change 100755 => 100644 configure diff --git a/config/c-compiler.m4 b/config/c-compiler.m4 index 069b468daa..7cbb8ec324 100644 --- a/config/c-compiler.m4 +++ b/config/c-compiler.m4 @@ -20,7 +20,7 @@ fi])# PGAC_C_SIGNED # PGAC_C_INLINE # ------------- # Check if the C compiler understands inline functions. -# Defines: inline, USE_INLINE +# Defines: inline, PG_USE_INLINE AC_DEFUN([PGAC_C_INLINE], [AC_C_INLINE AC_CACHE_CHECK([for quiet inline (no complaint if unreferenced)], pgac_cv_c_inline_quietly, @@ -33,7 +33,7 @@ AC_CACHE_CHECK([for quiet inline (no complaint if unreferenced)], pgac_cv_c_inli ac_c_werror_flag=$pgac_c_inline_save_werror fi]) if test "$pgac_cv_c_inline_quietly" != no; then - AC_DEFINE_UNQUOTED([USE_INLINE], 1, + AC_DEFINE_UNQUOTED([PG_USE_INLINE], 1, [Define to 1 if "static inline" works without unwanted warnings from ] [compilations where static inline functions are defined but not called.]) fi diff --git a/configure b/configure old mode 100755 new mode 100644 index b20df66363..85b4b952cb --- a/configure +++ b/configure @@ -15182,7 +15182,7 @@ $as_echo "$pgac_cv_c_inline_quietly" >&6; } if test "$pgac_cv_c_inline_quietly" != no; then cat >>confdefs.h <<_ACEOF -#define USE_INLINE 1 +#define PG_USE_INLINE 1 _ACEOF fi diff --git a/src/include/c.h b/src/include/c.h index 925d9617af..3b0fa9c4f0 100644 --- a/src/include/c.h +++ b/src/include/c.h @@ -758,13 +758,13 @@ typedef NameData *Name; * definitions are pulled in by the .c file as regular (not inline) symbols. * * The header must also declare the functions' prototypes, protected by - * !USE_INLINE. + * !PG_USE_INLINE. */ -#ifdef USE_INLINE +#ifdef PG_USE_INLINE #define STATIC_IF_INLINE static inline #else #define STATIC_IF_INLINE -#endif /* USE_INLINE */ +#endif /* PG_USE_INLINE */ /* ---------------------------------------------------------------- * Section 7: random stuff diff --git a/src/include/nodes/pg_list.h b/src/include/nodes/pg_list.h index d9cf18376b..34d339857e 100644 --- a/src/include/nodes/pg_list.h +++ b/src/include/nodes/pg_list.h @@ -75,12 +75,12 @@ struct ListCell * if supported by the compiler, or as regular functions otherwise. * See STATIC_IF_INLINE in c.h. */ -#ifndef USE_INLINE +#ifndef PG_USE_INLINE extern ListCell *list_head(const List *l); extern ListCell *list_tail(List *l); extern int list_length(const List *l); -#endif /* USE_INLINE */ -#if defined(USE_INLINE) || defined(PG_LIST_INCLUDE_DEFINITIONS) +#endif /* PG_USE_INLINE */ +#if defined(PG_USE_INLINE) || defined(PG_LIST_INCLUDE_DEFINITIONS) STATIC_IF_INLINE ListCell * list_head(const List *l) { @@ -98,7 +98,7 @@ list_length(const List *l) { return l ? l->length : 0; } -#endif /* USE_INLINE || PG_LIST_INCLUDE_DEFINITIONS */ +#endif /*-- PG_USE_INLINE || PG_LIST_INCLUDE_DEFINITIONS */ /* * NB: There is an unfortunate legacy from a previous incarnation of diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in index 61ae0c26b8..edaf85319b 100644 --- a/src/include/pg_config.h.in +++ b/src/include/pg_config.h.in @@ -681,6 +681,10 @@ /* PostgreSQL major version as a string */ #undef PG_MAJORVERSION +/* Define to 1 if "static inline" works without unwanted warnings from + compilations where static inline functions are defined but not called. */ +#undef PG_USE_INLINE + /* PostgreSQL version as a string */ #undef PG_VERSION @@ -749,10 +753,6 @@ (--enable-float8-byval) */ #undef USE_FLOAT8_BYVAL -/* Define to 1 if "static inline" works without unwanted warnings from - compilations where static inline functions are defined but not called. */ -#undef USE_INLINE - /* Define to 1 if you want 64-bit integer timestamp and interval support. (--enable-integer-datetimes) */ #undef USE_INTEGER_DATETIMES diff --git a/src/include/pg_config.h.win32 b/src/include/pg_config.h.win32 index 3715dbdca1..626ad47883 100644 --- a/src/include/pg_config.h.win32 +++ b/src/include/pg_config.h.win32 @@ -7,7 +7,7 @@ * HAVE_CBRT, HAVE_FUNCNAME_FUNC, HAVE_GETOPT, HAVE_GETOPT_H, HAVE_INTTYPES_H, * HAVE_GETOPT_LONG, HAVE_LOCALE_T, HAVE_RINT, HAVE_STRINGS_H, HAVE_STRTOLL, * HAVE_STRTOULL, HAVE_STRUCT_OPTION, ENABLE_THREAD_SAFETY, - * USE_INLINE, inline + * PG_USE_INLINE, inline */ /* Define to the type of arg 1 of 'accept' */ @@ -623,7 +623,7 @@ /* Define to 1 if "static inline" works without unwanted warnings from compilations where static inline functions are defined but not called. */ -#define USE_INLINE 1 +#define PG_USE_INLINE 1 /* Define to 1 if you want 64-bit integer timestamp and interval support. (--enable-integer-datetimes) */ diff --git a/src/include/utils/palloc.h b/src/include/utils/palloc.h index 75d8864ad4..5cb1ce57c8 100644 --- a/src/include/utils/palloc.h +++ b/src/include/utils/palloc.h @@ -81,10 +81,10 @@ extern void *repalloc(void *pointer, Size size); */ #ifndef FRONTEND -#ifndef USE_INLINE +#ifndef PG_USE_INLINE extern MemoryContext MemoryContextSwitchTo(MemoryContext context); -#endif /* !USE_INLINE */ -#if defined(USE_INLINE) || defined(MCXT_INCLUDE_DEFINITIONS) +#endif /* !PG_USE_INLINE */ +#if defined(PG_USE_INLINE) || defined(MCXT_INCLUDE_DEFINITIONS) STATIC_IF_INLINE MemoryContext MemoryContextSwitchTo(MemoryContext context) { @@ -93,9 +93,8 @@ MemoryContextSwitchTo(MemoryContext context) CurrentMemoryContext = context; return old; } -#endif - -#endif /* !FRONTEND */ +#endif /* PG_USE_INLINE || MCXT_INCLUDE_DEFINITIONS */ +#endif /* !FRONTEND */ /* * These are like standard strdup() except the copied string is diff --git a/src/include/utils/sortsupport.h b/src/include/utils/sortsupport.h index ecb51ed3be..9a576307ee 100644 --- a/src/include/utils/sortsupport.h +++ b/src/include/utils/sortsupport.h @@ -105,12 +105,12 @@ typedef struct SortSupportData * ApplySortComparator should be inlined if possible. See STATIC_IF_INLINE * in c.h. */ -#ifndef USE_INLINE +#ifndef PG_USE_INLINE extern int ApplySortComparator(Datum datum1, bool isNull1, Datum datum2, bool isNull2, SortSupport ssup); -#endif /* !USE_INLINE */ -#if defined(USE_INLINE) || defined(SORTSUPPORT_INCLUDE_DEFINITIONS) +#endif /* !PG_USE_INLINE */ +#if defined(PG_USE_INLINE) || defined(SORTSUPPORT_INCLUDE_DEFINITIONS) /* * Apply a sort comparator function and return a 3-way comparison result. * This takes care of handling reverse-sort and NULLs-ordering properly. @@ -147,7 +147,7 @@ ApplySortComparator(Datum datum1, bool isNull1, return compare; } -#endif /* USE_INLINE || SORTSUPPORT_INCLUDE_DEFINITIONS */ +#endif /*-- PG_USE_INLINE || SORTSUPPORT_INCLUDE_DEFINITIONS */ /* Other functions in utils/sort/sortsupport.c */ extern void PrepareSortSupportComparisonShim(Oid cmpFunc, SortSupport ssup);