diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-07-16 17:08:26 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-07-16 17:08:26 +0000 |
commit | 0933a0c3c72c87091e89bbf600fbea6f1fe50858 (patch) | |
tree | 43cc73555e3e44a89a475b3e3a9ad5d5a80e6247 /sw/inc/node.hxx | |
parent | 169ae3324aad0064d18ee9d116dbbc16c6a66f8d (diff) |
INTEGRATION: CWS ooo11rc2 (1.5.98); FILE MERGED
2003/07/15 03:08:57 fa 1.5.98.1: Conditionalize OS X + gcc 2.95 hacks for gcc 2.95 only.
http://www.openoffice.org/issues/show_bug.cgi?id=16849
Contributor:
Kevin Hendricks
Dan
fa@ooo
Diffstat (limited to 'sw/inc/node.hxx')
-rw-r--r-- | sw/inc/node.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx index 3e526d0bba1c..db9f4a9dab89 100644 --- a/sw/inc/node.hxx +++ b/sw/inc/node.hxx @@ -2,9 +2,9 @@ * * $RCSfile: node.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: vg $ $Date: 2003-04-17 10:08:47 $ + * last change: $Author: hr $ $Date: 2003-07-16 18:08:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -113,7 +113,7 @@ class SwPageDesc; class ViewShell; struct SwPosition; -#ifdef MACOSX +#if defined(MACOSX) && ( __GNUC__ < 3 ) #define INLINE /* GrP revisit with gcc3 */ #else #define INLINE inline |