aboutsummaryrefslogtreecommitdiff
path: root/src/include/utils/sortsupport.h
diff options
context:
space:
mode:
authorAlvaro Herrera <alvherre@alvh.no-ip.org>2012-10-09 11:10:10 -0300
committerAlvaro Herrera <alvherre@alvh.no-ip.org>2012-10-09 11:17:33 -0300
commitf46baf601d889b374ba5e5f4b8280fee5aa19a7f (patch)
tree2e41a243a5ae858ebea6d7cc50e67e6aa82a966d /src/include/utils/sortsupport.h
parent0b77aebabfbe9155ea88ee9e11fa126315473b86 (diff)
downloadpostgresql-f46baf601d889b374ba5e5f4b8280fee5aa19a7f.tar.gz
postgresql-f46baf601d889b374ba5e5f4b8280fee5aa19a7f.zip
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/sortsupport.h')
-rw-r--r--src/include/utils/sortsupport.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/include/utils/sortsupport.h b/src/include/utils/sortsupport.h
index ecb51ed3bea..9a576307eed 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);