Index: test/test_di.cxx
===================================================================
RCS file: /cvs/udk/cppu/test/test_di.cxx,v
retrieving revision 1.15
diff -u -u -r1.15 test_di.cxx
--- test/test_di.cxx	19 Aug 2002 07:18:48 -0000	1.15
+++ test/test_di.cxx	15 Mar 2004 09:27:51 -0000
@@ -63,6 +63,7 @@
 #include <rtl/ustring.hxx>
 #include <osl/diagnose.h>
 #include <osl/time.h>
+#include<sal/types.h>
 //
 #include <uno/dispatcher.h>
 #include <uno/environment.h>
@@ -414,7 +415,8 @@
 		
 		assign( (test::TestElement &)aData,
 				sal_True, '@', 17, 0x1234, 0xfedc, 0x12345678, 0xfedcba98,
-				0x123456789abcdef0, 0xfedcba9876543210,
+				SAL_CONST_INT64(0x123456789abcdef0),
+				SAL_CONST_UINT64(0xfedcba9876543210),
 				(float)17.0815, 3.1415926359, TestEnum_LOLA,
 				OUString::createFromAscii("dumdidum"), xDummyInterface,
 				makeAny( xDummyInterface ) );
Index: test/testcppu.cxx
===================================================================
RCS file: /cvs/udk/cppu/test/testcppu.cxx,v
retrieving revision 1.26
diff -u -u -r1.26 testcppu.cxx
--- test/testcppu.cxx	4 Sep 2003 10:53:52 -0000	1.26
+++ test/testcppu.cxx	15 Mar 2004 09:27:52 -0000
@@ -408,17 +408,17 @@
 	aAny = makeAny( (sal_uInt16)2 );
 	OSL_ASSERT( aAny.getValueType() == getCppuType( (sal_uInt16 *)0 ) );
 	OSL_ASSERT( *(sal_Int16*)aAny.getValue() == 2 );
-	sal_Int64 aInt64 = 0x200000000;
+	sal_Int64 aInt64 = SAL_CONST_INT64(0x200000000);
 	aAny = makeAny( aInt64 );
 	OSL_ASSERT( aAny.getValueType() == getCppuType( (sal_Int64 *)0 ) );
-	OSL_ASSERT( *(sal_Int64*)aAny.getValue() == 0x200000000 );
+	OSL_ASSERT( *(sal_Int64*)aAny.getValue() == SAL_CONST_INT64(0x200000000) );
 	aAny = makeAny( (sal_Int32)2 );
 	OSL_ASSERT( aAny.getValueType() == getCppuType( (sal_Int32 *)0 ) );
 	OSL_ASSERT( *(sal_Int32*)aAny.getValue() == 2 );
-	sal_uInt64 auInt64 = 0x200000000;
+	sal_uInt64 auInt64 = SAL_CONST_UINT64(0x200000000);
 	aAny = makeAny( auInt64 );
 	OSL_ASSERT( aAny.getValueType() == getCppuType( (sal_uInt64 *)0 ) );
-	OSL_ASSERT( *(sal_uInt64*)aAny.getValue() == 0x200000000 );
+	OSL_ASSERT( *(sal_uInt64*)aAny.getValue() == SAL_CONST_UINT64(0x200000000) );
 	aAny = makeAny( (sal_uInt32)2 );
 	OSL_ASSERT( aAny.getValueType() == getCppuType( (sal_uInt32 *)0 ) );
 	OSL_ASSERT( *(sal_uInt32*)aAny.getValue() == 2 );
@@ -459,17 +459,17 @@
 	aAny <<=( (sal_uInt16)2 );
 	OSL_ASSERT( aAny.getValueType() == getCppuType( (sal_uInt16 *)0 ) );
 	OSL_ASSERT( *(sal_Int16*)aAny.getValue() == 2 );
-	sal_Int64 aInt64 = 0x200000000;
+	sal_Int64 aInt64 = SAL_CONST_INT64(0x200000000);
 	aAny <<=( aInt64 );
 	OSL_ASSERT( aAny.getValueType() == getCppuType( (sal_Int64 *)0 ) );
-	OSL_ASSERT( *(sal_Int64*)aAny.getValue() == 0x200000000 );
+	OSL_ASSERT( *(sal_Int64*)aAny.getValue() == SAL_CONST_UINT64(0x200000000) );
 	aAny <<=( (sal_Int32)2 );
 	OSL_ASSERT( aAny.getValueType() == getCppuType( (sal_Int32 *)0 ) );
 	OSL_ASSERT( *(sal_Int32*)aAny.getValue() == 2 );
-	sal_uInt64 auInt64 = 0x200000000;
+	sal_uInt64 auInt64 = SAL_CONST_UINT64(0x200000000);
 	aAny <<=( auInt64 );
 	OSL_ASSERT( aAny.getValueType() == getCppuType( (sal_uInt64 *)0 ) );
-	OSL_ASSERT( *(sal_uInt64*)aAny.getValue() == 0x200000000 );
+	OSL_ASSERT( *(sal_uInt64*)aAny.getValue() == SAL_CONST_UINT64(0x200000000) );
 	aAny <<=( (sal_uInt32)2 );
 	OSL_ASSERT( aAny.getValueType() == getCppuType( (sal_uInt32 *)0 ) );
 	OSL_ASSERT( *(sal_uInt32*)aAny.getValue() == 2 );
@@ -477,7 +477,7 @@
 	OSL_ASSERT( aAny.getValueType() == getCppuType( (TypeClass *)0 ) );
 	OSL_ASSERT( *(TypeClass*)aAny.getValue() == TypeClass_STRUCT );
 	}
-    
+
     {
     // test seq< any >
     Sequence< Any > seqAny( 1 );
@@ -502,13 +502,13 @@
 	OSL_ASSERT( (makeAny( OUString( RTL_CONSTASCII_USTRINGPARAM("2") )) >>= a3.aString) &&
 				a3.aString == OUString::createFromAscii("2") );
 	OSL_ASSERT( (makeAny( (sal_uInt16)2) >>= a3.nuInt16) && a3.nuInt16 == 2 );
-	sal_Int64 aInt64 = 0x200000000;
+	sal_Int64 aInt64 = SAL_CONST_INT64(0x200000000);
 	OSL_ASSERT( makeAny( aInt64 ) >>= a3.nInt64 );
-	OSL_ASSERT( a3.nInt64 == 0x200000000 );
+	OSL_ASSERT( a3.nInt64 == SAL_CONST_INT64(0x200000000) );
 	OSL_ASSERT( (makeAny( (sal_Int32)2) >>= a3.nInt32) && a3.nInt32 == 2 );
-	sal_uInt64 auInt64 = 0x200000000;
+	sal_uInt64 auInt64 = SAL_CONST_UINT64(0x200000000);
 	OSL_ASSERT( makeAny( auInt64 ) >>= a3.nuInt64 );
-	OSL_ASSERT( a3.nuInt64 == 0x200000000 );
+	OSL_ASSERT( a3.nuInt64 == SAL_CONST_UINT64(0x200000000) );
 	OSL_ASSERT( (makeAny( (sal_uInt32)2) >>= a3.nuInt32) && a3.nuInt32 == 2 );
 	OSL_ASSERT( (makeAny( TypeClass_STRUCT) >>= a3.eType) && a3.eType == TypeClass_STRUCT );
 	//OSL_ASSERT( (makeAny( L'2' ) >>= a3.wChar) && a3.nInt8 ==L'2';