Index: interpreter/classes/NumberStringMath.cpp =================================================================== --- interpreter/classes/NumberStringMath.cpp (revision 5800) +++ interpreter/classes/NumberStringMath.cpp (working copy) @@ -91,11 +91,11 @@ CurrentActivation->setFuzz(saveFuzz); if (operation == OT_MAX) /* doing a MAX operation? */ { - reportException(Error_Incorrect_call_noarg, CHAR_MAX, arg + 1); + reportException(Error_Incorrect_call_noarg, CHAR_ORXMAX, arg + 1); } else /* nope must be min. */ { - reportException(Error_Incorrect_call_noarg, CHAR_MIN, arg + 1); + reportException(Error_Incorrect_call_noarg, CHAR_ORXMIN, arg + 1); } } Index: interpreter/classes/StringClass.cpp =================================================================== --- interpreter/classes/StringClass.cpp (revision 5800) +++ interpreter/classes/StringClass.cpp (working copy) @@ -879,7 +879,7 @@ if ((numstr = this->fastNumberString()) == OREF_NULL) { /* this is a conversion error */ - reportException(Error_Incorrect_method_string_nonumber, CHAR_MAX, this); + reportException(Error_Incorrect_method_string_nonumber, CHAR_ORXMAX, this); } /* have numberstring do this */ return numstr->Max(arguments, argCount); @@ -896,7 +896,7 @@ if ((numstr = this->fastNumberString()) == OREF_NULL) { /* this is a conversion error */ - reportException(Error_Incorrect_method_string_nonumber, CHAR_MIN, this); + reportException(Error_Incorrect_method_string_nonumber, CHAR_ORXMIN, this); } /* have numberstring do this */ return numstr->Min(arguments, argCount); Index: interpreter/expression/BuiltinFunctions.cpp =================================================================== --- interpreter/expression/BuiltinFunctions.cpp (revision 5800) +++ interpreter/expression/BuiltinFunctions.cpp (working copy) @@ -1767,13 +1767,13 @@ return number->format(before, after, expp, expt); } -#define MAX_MIN 1 -#define MAX_MAX argcount +#define ORXMAX_MIN 1 +#define ORXMAX_MAX argcount #define MAX_target 1 BUILTIN(MAX) { - check_args(MAX); /* check on required args */ + check_args(ORXMAX); /* check on required args */ /* get the argument in question */ RexxObject *argument = get_arg(MAX, target); if (isOfClass(NumberString, argument)) @@ -1787,13 +1787,13 @@ return target->Max(stack->arguments(argcount - 1), argcount - 1); } -#define MIN_MIN 1 -#define MIN_MAX argcount +#define ORXMIN_MIN 1 +#define ORXMIN_MAX argcount #define MIN_target 1 BUILTIN(MIN) { - check_args(MIN); /* check on required args */ + check_args(ORXMIN); /* check on required args */ /* get the argument in question */ RexxObject *argument = get_arg(MIN, target); if (isOfClass(NumberString, argument)) Index: interpreter/memory/Setup.cpp =================================================================== --- interpreter/memory/Setup.cpp (revision 5800) +++ interpreter/memory/Setup.cpp (working copy) @@ -878,8 +878,8 @@ defineKernelMethod(CHAR_DECODEBASE64 ,TheStringBehaviour, CPPM(RexxString::decodeBase64), 0); defineKernelMethod(CHAR_MAKESTRING ,TheStringBehaviour, CPPM(RexxObject::makeStringRexx), 0); defineKernelMethod(CHAR_ABS ,TheStringBehaviour, CPPM(RexxString::abs), 0); - defineKernelMethod(CHAR_MAX ,TheStringBehaviour, CPPM(RexxString::Max), A_COUNT); - defineKernelMethod(CHAR_MIN ,TheStringBehaviour, CPPM(RexxString::Min), A_COUNT); + defineKernelMethod(CHAR_ORXMAX ,TheStringBehaviour, CPPM(RexxString::Max), A_COUNT); + defineKernelMethod(CHAR_ORXMIN ,TheStringBehaviour, CPPM(RexxString::Min), A_COUNT); defineKernelMethod(CHAR_SIGN ,TheStringBehaviour, CPPM(RexxString::sign), 0); defineKernelMethod(CHAR_EQUAL ,TheStringBehaviour, CPPM(RexxString::equal), 1); defineKernelMethod(CHAR_BACKSLASH_EQUAL ,TheStringBehaviour, CPPM(RexxString::notEqual), 1); @@ -1021,8 +1021,8 @@ defineKernelMethod(CHAR_D2C ,TheIntegerBehaviour, CPPM(RexxInteger::d2c), 1); defineKernelMethod(CHAR_D2X ,TheIntegerBehaviour, CPPM(RexxInteger::d2x), 1); defineKernelMethod(CHAR_ABS ,TheIntegerBehaviour, CPPM(RexxInteger::abs), 0); - defineKernelMethod(CHAR_MAX ,TheIntegerBehaviour, CPPM(RexxInteger::Max), A_COUNT); - defineKernelMethod(CHAR_MIN ,TheIntegerBehaviour, CPPM(RexxInteger::Min), A_COUNT); + defineKernelMethod(CHAR_ORXMAX ,TheIntegerBehaviour, CPPM(RexxInteger::Max), A_COUNT); + defineKernelMethod(CHAR_ORXMIN ,TheIntegerBehaviour, CPPM(RexxInteger::Min), A_COUNT); defineKernelMethod(CHAR_SIGN ,TheIntegerBehaviour, CPPM(RexxInteger::sign), 0); defineKernelMethod(CHAR_EQUAL ,TheIntegerBehaviour, CPPM(RexxInteger::equal), 1); defineKernelMethod(CHAR_BACKSLASH_EQUAL ,TheIntegerBehaviour, CPPM(RexxInteger::notEqual), 1); @@ -1073,8 +1073,8 @@ /* instance behaviour mdict */ defineKernelMethod(CHAR_UNKNOWN ,TheNumberStringBehaviour, CPPM(RexxObject::unknownRexx), 2); defineKernelMethod(CHAR_ABS ,TheNumberStringBehaviour, CPPM(RexxNumberString::abs), 0); - defineKernelMethod(CHAR_MAX ,TheNumberStringBehaviour, CPPM(RexxNumberString::Max), A_COUNT); - defineKernelMethod(CHAR_MIN ,TheNumberStringBehaviour, CPPM(RexxNumberString::Min), A_COUNT); + defineKernelMethod(CHAR_ORXMAX ,TheNumberStringBehaviour, CPPM(RexxNumberString::Max), A_COUNT); + defineKernelMethod(CHAR_ORXMIN ,TheNumberStringBehaviour, CPPM(RexxNumberString::Min), A_COUNT); defineKernelMethod(CHAR_SIGN ,TheNumberStringBehaviour, CPPM(RexxNumberString::Sign), 0); defineKernelMethod(CHAR_D2C ,TheNumberStringBehaviour, CPPM(RexxNumberString::d2c), 1); defineKernelMethod(CHAR_D2X ,TheNumberStringBehaviour, CPPM(RexxNumberString::d2x), 1); Index: interpreter/parser/KeywordConstants.cpp =================================================================== --- interpreter/parser/KeywordConstants.cpp (revision 5800) +++ interpreter/parser/KeywordConstants.cpp (working copy) @@ -202,8 +202,8 @@ KeywordEntry(CHAR_LINEOUT, BUILTIN_LINEOUT), KeywordEntry(CHAR_LINES, BUILTIN_LINES), KeywordEntry(CHAR_LOWER, BUILTIN_LOWER), - KeywordEntry(CHAR_MAX, BUILTIN_MAX), - KeywordEntry(CHAR_MIN, BUILTIN_MIN), + KeywordEntry(CHAR_ORXMAX, BUILTIN_MAX), + KeywordEntry(CHAR_ORXMIN, BUILTIN_MIN), KeywordEntry(CHAR_OVERLAY, BUILTIN_OVERLAY), KeywordEntry(CHAR_POS, BUILTIN_POS), KeywordEntry(CHAR_QUALIFY, BUILTIN_QUALIFY), @@ -283,8 +283,8 @@ KeywordEntry(CHAR_LINEOUT, BUILTIN_LINEOUT), KeywordEntry(CHAR_LINES, BUILTIN_LINES), KeywordEntry(CHAR_LOWER, BUILTIN_LOWER), - KeywordEntry(CHAR_MAX, BUILTIN_MAX), - KeywordEntry(CHAR_MIN, BUILTIN_MIN), + KeywordEntry(CHAR_ORXMAX, BUILTIN_MAX), + KeywordEntry(CHAR_ORXMIN, BUILTIN_MIN), KeywordEntry(CHAR_OVERLAY, BUILTIN_OVERLAY), KeywordEntry(CHAR_POS, BUILTIN_POS), KeywordEntry(CHAR_QUALIFY, BUILTIN_QUALIFY), Index: interpreter/runtime/RexxConstants.hpp =================================================================== --- interpreter/runtime/RexxConstants.hpp (revision 5800) +++ interpreter/runtime/RexxConstants.hpp (working copy) @@ -56,8 +56,8 @@ #endif #define CHARCONSTANT(name, value) CONSTCLASS char CHAR_##name[] INITIAL(value) -#undef CHAR_MAX /* undefine limits versions */ -#undef CHAR_MIN +//#undef CHAR_MAX /* undefine limits versions */ +//#undef CHAR_MIN CHARCONSTANT(ACTIVITY, "ACTIVITY"); CHARCONSTANT(ADD, "ADD"); @@ -456,8 +456,8 @@ CHARCONSTANT(LINEOUT, "LINEOUT"); CHARCONSTANT(LINES, "LINES"); CHARCONSTANT(LINE, "LINE"); -CHARCONSTANT(MAX, "MAX"); -CHARCONSTANT(MIN, "MIN"); +CHARCONSTANT(ORXMAX, "MAX"); +CHARCONSTANT(ORXMIN, "MIN"); CHARCONSTANT(OVERLAY, "OVERLAY"); CHARCONSTANT(POS, "POS"); CHARCONSTANT(QUEUED, "QUEUED");