mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS os2port01 (1.29.18); FILE MERGED

Browse Source 
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.
This commit is contained in:
Vladimir Glazounov
2007-09-20 13:44:20 +00:00
parent 0857939caf
commit d8c6404c78
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cppu/source/uno/data.cxx
View File

@@ -4,9 +4,9 @@
*
* $RCSfile: data.cxx,v $
*
* $Revision: 1.30 $
* $Revision: 1.31 $
*
* last change: $Author: obo $ $Date: 2006-09-17 00:21:05 $
* last change: $Author: vg $ $Date: 2007-09-20 14:44:20 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -356,18 +356,18 @@ sal_Bool SAL_CALL uno_type_isAssignableFromData(
//##################################################################################################
#if OSL_DEBUG_LEVEL > 0
#if OSL_DEBUG_LEVEL > 10
#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