summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorPatrick Luby <pluby@openoffice.org>2000-11-15 22:00:43 +0000
committerPatrick Luby <pluby@openoffice.org>2000-11-15 22:00:43 +0000
commit52ffe5ce29106c65b23547397d18659f30f57834 (patch)
tree856aa4b223a2d1789ab43a2dfd7d9faec9739910 /vcl
parentbaf881cb9309779ea1f211f07461f64f5f4164e6 (diff)
Corrected #ifdef's so that header will compile in pre-SRC612 builds
Diffstat (limited to 'vcl')
-rw-r--r--vcl/aqua/inc/salframe.h8
-rw-r--r--vcl/aqua/inc/salinst.h10
2 files changed, 9 insertions, 9 deletions
diff --git a/vcl/aqua/inc/salframe.h b/vcl/aqua/inc/salframe.h
index b252d6625269..29a6d08f463f 100644
--- a/vcl/aqua/inc/salframe.h
+++ b/vcl/aqua/inc/salframe.h
@@ -2,9 +2,9 @@
*
* $RCSfile: salframe.h,v $
*
- * $Revision: 1.8 $
+ * $Revision: 1.9 $
*
- * last change: $Author: pluby $ $Date: 2000-11-15 21:49:28 $
+ * last change: $Author: pluby $ $Date: 2000-11-15 23:00:43 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -70,7 +70,7 @@
#include <VCLWindow.h>
#endif
-#if SUPD >= 612
+#if defined __cplusplus || SUPD >= 612
#ifndef _SV_SYSDATA_HXX
#include <sysdata.hxx>
@@ -116,6 +116,6 @@ struct SalFrameData
BOOL mbCompositionMode; // TRUE: Wir befinden uns im Composition-Modus
BOOL mbCandidateMode; // TRUE: Wir befinden uns im Candidate-Modus
};
-#endif // SUPD >= 612
+#endif // __cplusplus || SUPD >= 612
#endif // _SV_SALFRAME_H
diff --git a/vcl/aqua/inc/salinst.h b/vcl/aqua/inc/salinst.h
index e4b5f34fe338..3c7e976e2701 100644
--- a/vcl/aqua/inc/salinst.h
+++ b/vcl/aqua/inc/salinst.h
@@ -2,9 +2,9 @@
*
* $RCSfile: salinst.h,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: pluby $ $Date: 2000-11-15 21:49:28 $
+ * last change: $Author: pluby $ $Date: 2000-11-15 23:00:43 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -70,9 +70,9 @@
#include <VCLWindow.h>
#endif
-#if SUPD >= 612
+#if defined __cplusplus || SUPD >= 612
-#ifdef __cplusplus
+#ifdef __cplusplus
#ifdef _VOS_NO_NAMESPACE
class OMutex;
@@ -113,6 +113,6 @@ public:
USHORT mnYieldWaitCount; // Wait-Count
};
-#endif // SUPD >= 612
+#endif // __cplusplus || SUPD >= 612
#endif // _SV_SALINST_H