diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-07-05 08:03:26 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-07-05 08:03:26 +0000 |
| commit | 87a8f5fba070527d4946f9fce71c86cc559d6040 (patch) | |
| tree | dbe2acf3d8fd382a780b618cca813220010841f5 /solenv | |
| parent | dea27b4415641b9c09e9a8ce9d9bb398476d25ee (diff) | |
INTEGRATION: CWS aquavcl01 (1.7.126); FILE MERGED
2007/01/07 14:42:31 mox 1.7.126.2: Issue number: #69066#
Some build fixes to get cairo canvas compiling on Mac OS X
2006/02/21 18:15:36 fheckl 1.7.126.1: Commenting out some parts that hinder compilation of aqua build on MacOSX
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/inc/postmac.h | 7 | ||||
| -rw-r--r-- | solenv/inc/premac.h | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/solenv/inc/postmac.h b/solenv/inc/postmac.h index 23d21763ffe4..a13203087379 100644 --- a/solenv/inc/postmac.h +++ b/solenv/inc/postmac.h @@ -4,9 +4,9 @@ * * $RCSfile: postmac.h,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: rt $ $Date: 2005-09-08 09:36:31 $ + * last change: $Author: rt $ $Date: 2007-07-05 09:03:06 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -50,10 +50,11 @@ #undef LSize #undef ModalDialog #undef SetCursor -#undef ShowWindow +//#undef ShowWindow #undef StringPtr #undef DirInfo #undef BOOL #undef ULONG #undef Line #undef TimeValue +#undef Pattern diff --git a/solenv/inc/premac.h b/solenv/inc/premac.h index 47e9faba40f4..d8f1e2144bee 100644 --- a/solenv/inc/premac.h +++ b/solenv/inc/premac.h @@ -4,9 +4,9 @@ * * $RCSfile: premac.h,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: rt $ $Date: 2005-09-08 09:37:32 $ + * last change: $Author: rt $ $Date: 2007-07-05 09:03:26 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -50,10 +50,11 @@ #define LSize MacOSLSize #define ModalDialog MacOSModalDialog #define SetCursor MacOSSetCursor -#define ShowWindow MacOSShowWindow +//#define ShowWindow MacOSShowWindow #define StringPtr MacOSStringPtr #define DirInfo MacOSDirInfo #define BOOL MacOSBOOL #define ULONG MacOSULONG #define Line MacOSLine #define TimeValue MacOSTimeValue +#define Pattern MacOSPattern |