database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-08-27 07:42:10 +03:00
Code Activity

Rename USE_INLINE to PG_USE_INLINE

Browse Source 
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.
This commit is contained in:
Alvaro Herrera
2012-10-09 11:10:10 -03:00
parent 0b77aebabf
commit f46baf601d
8 changed files with 25 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/include/utils/palloc.h
View File

@@ -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

8
src/include/utils/sortsupport.h
View File

@@ -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);