[EMAIL PROTECTED] wrote:
User: vg
Date: 2007-09-20 14:44:23+0000
Modified:
udk/cppu/source/uno/data.cxx
Log:
INTEGRATION: CWS os2port01 (1.29.18); FILE MERGED
2007/08/06 10:35:03 obr 1.29.18.2: RESYNC: (1.29-1.30); FILE MERGED
2006/12/28 14:53:44 ydario 1.29.18.1: OS/2 initial import.
File Changes:
Directory: /udk/cppu/source/uno/
================================
File [changed]: data.cxx
Url:
http://udk.openoffice.org/source/browse/udk/cppu/source/uno/data.cxx?r1=1.30&r2=1.31
Delta lines: +5 -5
-------------------
--- data.cxx 2006-09-17 00:21:05+0000 1.30
+++ data.cxx 2007-09-20 14:44:20+0000 1.31
@@ -356,18 +356,18 @@
//##################################################################################################
-#if OSL_DEBUG_LEVEL > 0
+#if OSL_DEBUG_LEVEL > 10
Was the above change (effectively removing the BinaryCompatible_Impl
test from standard debug builds, IIUC) really intended?
-Stephan
#include <stdio.h>
-#ifdef SAL_W32
-# pragma pack(push, 8)
+#if defined( SAL_W32)
+#pragma pack(push, 8)
#elif defined(SAL_OS2)
-# pragma pack(8)
+#pragma pack(push, 4)
#endif
#if defined(INTEL) \
- && (defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD)) ||
defined(MACOSX) \
+ && (defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD) ||
defined(OS2)) || defined(MACOSX) \
|| defined(__SUNPRO_CC) && defined(SOLARIS))
#define MAX_ALIGNMENT_4
#endif
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
