diff --git a/src/gdd/aitHelpers.h b/src/gdd/aitHelpers.h index af20a7dbf..1a7a3a1f3 100644 --- a/src/gdd/aitHelpers.h +++ b/src/gdd/aitHelpers.h @@ -8,6 +8,9 @@ * $Id$ * * $Log$ + * Revision 1.20 1999/08/05 22:17:11 jhill + * removed knowledge of class osiTime + * * Revision 1.19 1999/05/10 23:38:33 jhill * convert to and from other time stamp formats * @@ -80,10 +83,6 @@ #include "shareLib.h" -#ifndef max -#define max(A,B) ((A)>(B)?(A):(B)) -#endif - #define NSecPerSec 1000000000u #define NSecPerUSec 1000u #define SecPerMin 60u @@ -443,7 +442,8 @@ inline int aitString::installConstImortalBuf(const char* pString, unsigned strLe inline int aitString::copy(const char* pString, unsigned stringLength) { - return this->copy(pString, stringLength, max(this->bufLen,stringLength+1u)); + return this->copy(pString, stringLength, + this->bufLen>(stringLength+1u) ? this->bufLen : (stringLength+1u) ); } inline int aitString::copy(const char* p)