diff options
| author | Alvaro Herrera <alvherre@alvh.no-ip.org> | 2012-10-09 11:10:10 -0300 |
|---|---|---|
| committer | Alvaro Herrera <alvherre@alvh.no-ip.org> | 2012-10-09 11:17:33 -0300 |
| commit | f46baf601d889b374ba5e5f4b8280fee5aa19a7f (patch) | |
| tree | 2e41a243a5ae858ebea6d7cc50e67e6aa82a966d /src/include/utils/palloc.h | |
| parent | 0b77aebabfbe9155ea88ee9e11fa126315473b86 (diff) | |
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.
Diffstat (limited to 'src/include/utils/palloc.h')
| -rw-r--r-- | src/include/utils/palloc.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/include/utils/palloc.h b/src/include/utils/palloc.h index 75d8864ad43..5cb1ce57c81 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 |