diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/utils/adt/arrayfuncs.c | 4 | ||||
| -rw-r--r-- | src/backend/utils/adt/chunk.c | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/backend/utils/adt/arrayfuncs.c b/src/backend/utils/adt/arrayfuncs.c index b8b023575d5..9f04ca48229 100644 --- a/src/backend/utils/adt/arrayfuncs.c +++ b/src/backend/utils/adt/arrayfuncs.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.49 1999/11/22 17:56:29 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.50 1999/12/09 15:56:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -1832,7 +1832,9 @@ _LOtransfer(char **destfd, int isDestLO) { #define MAX_READ (512 * 1024) +#if !defined(min) #define min(a, b) (a < b ? a : b) +#endif struct varlena *v = NULL; int tmp, inc, diff --git a/src/backend/utils/adt/chunk.c b/src/backend/utils/adt/chunk.c index d64ed0cf02d..78262d06523 100644 --- a/src/backend/utils/adt/chunk.c +++ b/src/backend/utils/adt/chunk.c @@ -6,7 +6,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/chunk.c,v 1.23 1999/07/17 20:17:54 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/chunk.c,v 1.24 1999/12/09 15:56:16 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -28,8 +28,12 @@ #define MANY 10000 #define MAXPAT 20 #define quot_ceil(x,y) (((x)+(y)-1)/(y)) +#if !defined(min) #define min(x,y) (((x) < (y))? (x) : (y)) +#endif +#if !defined(max) #define max(x,y) (((x) > (y))? (x) : (y)) +#endif static CHUNK_INFO cInfo; |