User: hr Date: 2007-11-02 12:13:09+0000 Modified: dba/connectivity/source/inc/java/lang/Object.hxx
Log: INTEGRATION: CWS os2port02 (1.12.44); FILE MERGED 2007/10/04 19:47:14 ydario 1.12.44.1: Issue number: i82034 Submitted by: ydario Reviewed by: ydario Commit of changes for OS/2 CWS source code integration. File Changes: Directory: /dba/connectivity/source/inc/java/lang/ ================================================== File [changed]: Object.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/inc/java/lang/Object.hxx?r1=1.12&r2=1.13 Delta lines: +1 -8 ------------------- --- Object.hxx 2007-06-27 14:37:56+0000 1.12 +++ Object.hxx 2007-11-02 12:13:06+0000 1.13 @@ -40,9 +40,6 @@ #include <cstdarg> #endif -#ifdef OS2 -#include <typedefs.h> -#endif #ifndef _OSL_THREAD_H_ #include <osl/thread.h> #endif @@ -67,13 +64,9 @@ #error "no 64 bit pointer" #else #ifdef OS2 -#define INT64_TO_PVOID(x) (void *)x.lo -inline jlong Make_Os2_Int64( sal_Int32 hi, sal_Int32 lo ) {jlong x = CONST64( hi, lo ); return x; } -#define PVOID_TO_INT64(x) Make_Os2_Int64( 0, (sal_Int32)x ) -#else //OS2 #define PVOID_TO_INT64(x) (jlong)(sal_Int32)x #define INT64_TO_PVOID(x) (void *)x -#endif //Os2 +#endif // OS2 #endif //HAVE_64BIT_POINTERS namespace comphelper --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
