diff options
author | Bruce Momjian <bruce@momjian.us> | 2002-02-18 14:25:40 +0000 |
---|---|---|
committer | Bruce Momjian <bruce@momjian.us> | 2002-02-18 14:25:40 +0000 |
commit | b4a5fa45187979ff21aecdf8f089935769a17461 (patch) | |
tree | 23663a11c075b3278b0ffeba03518aefdb381845 /src/backend/utils/adt/arrayfuncs.c | |
parent | d622cf867bb11b39f087c7c0d9952098e0a6e85f (diff) | |
download | postgresql-b4a5fa45187979ff21aecdf8f089935769a17461.tar.gz postgresql-b4a5fa45187979ff21aecdf8f089935769a17461.zip |
Remove MAX/MIN() macros, use c.h Max/Min() instead.
Diffstat (limited to 'src/backend/utils/adt/arrayfuncs.c')
-rw-r--r-- | src/backend/utils/adt/arrayfuncs.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/backend/utils/adt/arrayfuncs.c b/src/backend/utils/adt/arrayfuncs.c index 0cfa371c998..99c7bb9e9c1 100644 --- a/src/backend/utils/adt/arrayfuncs.c +++ b/src/backend/utils/adt/arrayfuncs.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.72 2001/11/29 21:02:41 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.73 2002/02/18 14:24:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -46,13 +46,6 @@ * Local definitions * ---------- */ -#ifndef MIN -#define MIN(a,b) (((a)<(b)) ? (a) : (b)) -#endif -#ifndef MAX -#define MAX(a,b) (((a)>(b)) ? (a) : (b)) -#endif - #define ASSGN "=" #define RETURN_NULL(type) do { *isNull = true; return (type) 0; } while (0) @@ -1222,8 +1215,8 @@ array_set_slice(ArrayType *array, */ int oldlb = ARR_LBOUND(array)[0]; int oldub = oldlb + ARR_DIMS(array)[0] - 1; - int slicelb = MAX(oldlb, lowerIndx[0]); - int sliceub = MIN(oldub, upperIndx[0]); + int slicelb = Max(oldlb, lowerIndx[0]); + int sliceub = Min(oldub, upperIndx[0]); char *oldarraydata = ARR_DATA_PTR(array); lenbefore = array_nelems_size(oldarraydata, |