diff options
author | Tom Lane <tgl@sss.pgh.pa.us> | 2004-10-21 19:28:36 +0000 |
---|---|---|
committer | Tom Lane <tgl@sss.pgh.pa.us> | 2004-10-21 19:28:36 +0000 |
commit | 380bd04c1658795c77b3b808ee766347188fab5f (patch) | |
tree | cb654e3e510cb1974120cd4d3ea1984b30f3eb32 /src/interfaces/libpq/fe-exec.c | |
parent | a171fc1a4f37e37c1e80fe3e92a96b2bd37c8f98 (diff) | |
download | postgresql-380bd04c1658795c77b3b808ee766347188fab5f.tar.gz postgresql-380bd04c1658795c77b3b808ee766347188fab5f.zip |
Standardize on using the Min, Max, and Abs macros that are in our c.h file,
getting rid of numerous ad-hoc versions that have popped up in various
places. Shortens code and avoids conflict with Windows min() and max()
macros.
Diffstat (limited to 'src/interfaces/libpq/fe-exec.c')
-rw-r--r-- | src/interfaces/libpq/fe-exec.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/interfaces/libpq/fe-exec.c b/src/interfaces/libpq/fe-exec.c index fff9746e33b..00f48ec4064 100644 --- a/src/interfaces/libpq/fe-exec.c +++ b/src/interfaces/libpq/fe-exec.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/interfaces/libpq/fe-exec.c,v 1.164 2004/10/18 22:00:42 tgl Exp $ + * $PostgreSQL: pgsql/src/interfaces/libpq/fe-exec.c,v 1.165 2004/10/21 19:28:36 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -111,14 +111,9 @@ static PGresult *PQexecFinish(PGconn *conn); * ---------------- */ -#ifdef MAX -#undef MAX -#endif -#define MAX(a,b) ((a) > (b) ? (a) : (b)) - #define PGRESULT_DATA_BLOCKSIZE 2048 #define PGRESULT_ALIGN_BOUNDARY MAXIMUM_ALIGNOF /* from configure */ -#define PGRESULT_BLOCK_OVERHEAD MAX(sizeof(PGresult_data), PGRESULT_ALIGN_BOUNDARY) +#define PGRESULT_BLOCK_OVERHEAD Max(sizeof(PGresult_data), PGRESULT_ALIGN_BOUNDARY) #define PGRESULT_SEP_ALLOC_THRESHOLD (PGRESULT_DATA_BLOCKSIZE / 2) |