No easy access to min() or max() macros, rewrite code to not use them.

diff --git a/cde/lib/tt/slib/mp_otype.C b/cde/lib/tt/slib/mp_otype.C
index c0ad448480bc691ad2a64824647208ce6bd97c4d..cde56abf43f21439b130f8237186ef8c076fef68 100644 (file)
--- a/cde/lib/tt/slib/mp_otype.C
+++ b/cde/lib/tt/slib/mp_otype.C
@@ -32,7 +32,7 @@
  */
 #include <stdlib.h>
 #if defined(linux)
-# include <g++/minmax.h>
+/*# include <g++/minmax.h>*/
 #else
 # include <macros.h>
 #endif
@@ -311,7 +311,12 @@ int _Tt_otype::
 xdr_version_required() const
 {
        int version = _Tt_signature::xdr_version_required_( _hsigs );
-       return max(version, _Tt_signature::xdr_version_required_( _osigs ));
+//     return max(version, _Tt_signature::xdr_version_required_( _osigs ));
+       if (version > _Tt_signature::xdr_version_required_( _osigs )) {
+               return version;
+       } else {
+               return _Tt_signature::xdr_version_required_( _osigs );
+       }
 }
 
 //

diff --git a/cde/lib/tt/slib/mp_ptype.C b/cde/lib/tt/slib/mp_ptype.C
index 3d5b0157824264daf1011a817e6aa76e56c3cbb0..6878733661fa66577ab71da09ae8d8f026c4b072 100644 (file)
--- a/cde/lib/tt/slib/mp_ptype.C
+++ b/cde/lib/tt/slib/mp_ptype.C
@@ -27,7 +27,7 @@
 //%%  $TOG: mp_ptype.C /main/4 1998/03/20 14:27:56 mgreess $                                                   
 #include <stdlib.h>
 #if defined(linux)
-# include <g++/minmax.h>
+/*# include <g++/minmax.h>*/
 #else
 # include <macros.h>
 #endif
@@ -711,7 +711,12 @@ int _Tt_ptype::
 xdr_version_required() const
 {
        int version = _Tt_signature::xdr_version_required_( _hsigs );
-       return max(version, _Tt_signature::xdr_version_required_( _osigs ));
+//     return max(version, _Tt_signature::xdr_version_required_( _osigs ));
+       if(version > _Tt_signature::xdr_version_required_( _osigs )) {
+               return version;
+       } else {
+               return _Tt_signature::xdr_version_required_( _osigs );
+       }
 }