From 35b2755efea7fa72f4881c1c42cb07ccb64a6d3f Mon Sep 17 00:00:00 2001 From: Ralph Lange Date: Tue, 13 Feb 2001 20:49:44 +0000 Subject: [PATCH] No min() and max() macros in c++ --- src/libCom/misc/dbDefs.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/libCom/misc/dbDefs.h b/src/libCom/misc/dbDefs.h index 2d022aeaf..83795236a 100644 --- a/src/libCom/misc/dbDefs.h +++ b/src/libCom/misc/dbDefs.h @@ -75,6 +75,8 @@ (sizeof (array) / sizeof ((array) [0])) #endif +#ifndef __cplusplus + #ifndef max #define max(x, y) (((x) < (y)) ? (y) : (x)) #endif @@ -82,6 +84,8 @@ #define min(x, y) (((x) < (y)) ? (x) : (y)) #endif +#endif + #ifndef OFFSET #define OFFSET(structure, member) /* byte offset of member in structure*/\ ((int) &(((structure *) 0) -> member))