summaryrefslogtreecommitdiff
path: root/basic
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2003-07-16 16:37:53 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2003-07-16 16:37:53 +0000
commitfd566b380a8da0e8d069917d81bd41cb41c4980a (patch)
treee853a2a0e2c25b136fd75319d52a8c6a36eb5707 /basic
parentfe0541fed8fda6a67ae3b42eb75de4585c191ecc (diff)
INTEGRATION: CWS ooo11rc2 (1.7.26); FILE MERGED
2003/07/14 16:10:41 fa 1.7.26.1: Conditionalize OS X + gcc 2.95 hacks for gcc 2.95 only. http://www.openoffice.org/project/www/issues/show_bug.cgi?id=16731 Contributor: Kevin Hendricks Dan fa@ooo
Diffstat (limited to 'basic')
-rw-r--r--basic/source/classes/disas.cxx16
1 files changed, 8 insertions, 8 deletions
diff --git a/basic/source/classes/disas.cxx b/basic/source/classes/disas.cxx
index 62e539150784..d1c86ac3ecc3 100644
--- a/basic/source/classes/disas.cxx
+++ b/basic/source/classes/disas.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: disas.cxx,v $
*
- * $Revision: 1.7 $
+ * $Revision: 1.8 $
*
- * last change: $Author: rt $ $Date: 2003-04-23 16:55:41 $
+ * last change: $Author: hr $ $Date: 2003-07-16 17:37:53 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -74,7 +74,7 @@
#include "macfix.hxx"
-#ifdef MACOSX
+#if defined(MACOSX) && (__GNUC__ < 3)
static char* pOp1[] = {
#else
static const char* pOp1[] = {
@@ -129,7 +129,7 @@ static const char* pOp1[] = {
"REDIMP_ERASE"
};
-#ifdef MACOSX
+#if defined(MACOSX) && (__GNUC__ < 3)
static char* pOp2[] = {
#else
static const char* pOp2[] = {
@@ -161,7 +161,7 @@ static const char* pOp2[] = {
"ARGTYP", // Letzten Parameter in Argv konvertieren (+Typ)
};
-#ifdef MACOSX
+#if defined(MACOSX) && (__GNUC__ < 3)
static char* pOp3[] = {
#else
static const char* pOp3[] = {
@@ -192,7 +192,7 @@ static const char* pOp3[] = {
"DCREATE_REDIMP", // User defined Objekt-Array redimensionieren (+StringId+StringId)
};
-#ifdef MACOSX
+#if defined(MACOSX) && (__GNUC__ < 3)
static char** pOps[3] = { pOp1, pOp2, pOp3 };
#else
static const char** pOps[3] = { pOp1, pOp2, pOp3 };
@@ -200,7 +200,7 @@ static const char** pOps[3] = { pOp1, pOp2, pOp3 };
typedef void( SbiDisas::*Func )( String& ); // Verarbeitungsroutine
-#ifdef MACOSX
+#if defined(MACOSX) && (__GNUC__ < 3)
static Func pOperand2[] = {
#else
static const Func pOperand2[] = {
@@ -231,7 +231,7 @@ static const Func pOperand2[] = {
MEMBER(SbiDisas::TypeOp), // Letzten Parameter in Argv konvertieren (+Typ)
};
-#ifdef MACOSX
+#if defined(MACOSX) && (__GNUC__ < 3)
static Func pOperand3[] = {
#else
static const Func pOperand3[] = {