external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00
Code Issues Releases Wiki Activity

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

Browse source
This commit is contained in:
Peter Howkins 2012-03-12 00:04:39 +00:00
parent 8b79b425f8
commit 13f6ea01d4
2 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
cde/lib/tt/slib/mp_otype.C
View file

@ -32,7 +32,7 @@
*/ */
#include <stdlib.h> #include <stdlib.h>
#if defined(linux) #if defined(linux)
# include <g++/minmax.h> /*# include <g++/minmax.h>*/
#else #else
# include <macros.h> # include <macros.h>
#endif #endif
@ -311,7 +311,12 @@ int _Tt_otype::
xdr_version_required() const xdr_version_required() const
{ {
int version = _Tt_signature::xdr_version_required_( _hsigs ); 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 );
}
} }
// //

9
cde/lib/tt/slib/mp_ptype.C
View file

@ -27,7 +27,7 @@
//%% $TOG: mp_ptype.C /main/4 1998/03/20 14:27:56 mgreess $ //%% $TOG: mp_ptype.C /main/4 1998/03/20 14:27:56 mgreess $
#include <stdlib.h> #include <stdlib.h>
#if defined(linux) #if defined(linux)
# include <g++/minmax.h> /*# include <g++/minmax.h>*/
#else #else
# include <macros.h> # include <macros.h>
#endif #endif
@ -711,7 +711,12 @@ int _Tt_ptype::
xdr_version_required() const xdr_version_required() const
{ {
int version = _Tt_signature::xdr_version_required_( _hsigs ); 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 );
}
} }