diff -ur ooo_SRC680_m140_src.orig/tools/inc/solar.h ooo_SRC680_m140_src/tools/inc/solar.h --- ooo_SRC680_m140_src.orig/tools/inc/solar.h 2005-11-16 18:20:18.000000000 +0100 +++ ooo_SRC680_m140_src/tools/inc/solar.h 2005-11-16 21:35:52.000000000 +0100 @@ -272,8 +272,12 @@ inline USHORT Max( USHORT a, USHORT b ) { return (a>b?a:b); } inline long Min( long a, long b ) { return (ab?a:b); } +#if SAL_TYPES_SIZEOFLONG == 8 inline ULONG Min( ULONG a, ULONG b ) { return (ab?a:b); } +#endif +inline sal_uInt32 Min( sal_uInt32 a, sal_uInt32 b ) { return (ab?a:b); } inline char Abs( char a ) { return (a>=0?a:-a); } inline int Abs( int a ) { return (a>=0?a:-a); }