summaryrefslogtreecommitdiff
path: root/vcl/aqua
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2009-09-16 14:49:32 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2009-09-16 14:49:32 +0000
commite66e25555bc9d6c95144d349235216db4420c099 (patch)
tree078f829ca94a204fa4dfec93e0dc49aa86be9213 /vcl/aqua
parentcf4f7bd8bec78d02d5af02397961211c62692224 (diff)
CWS-TOOLING: integrate CWS cloph13
2009-09-01 #i104566# also use syslibroot/isysroot for external components 2009-08-28 #i104568# clean up duplicated definitions of OBJCXXFLAGS 2009-08-28 #i104567# add ccache-detection to configure (to skip to objcxx-flags) 2009-08-28 #i104566# use Mac OS X 10.4-SDK to ensure backwards compatibility use MACOSX_DEPLOYMENT_TARGET and sysroot/syslibroot switches ignore "-isysroot /Developer/..." arguments for OOo's cpp
Diffstat (limited to 'vcl/aqua')
-rw-r--r--vcl/aqua/source/app/makefile.mk2
-rwxr-xr-xvcl/aqua/source/window/salframeview.mm2
2 files changed, 1 insertions, 3 deletions
diff --git a/vcl/aqua/source/app/makefile.mk b/vcl/aqua/source/app/makefile.mk
index 2bf3641898f1..a90c95c74a6e 100644
--- a/vcl/aqua/source/app/makefile.mk
+++ b/vcl/aqua/source/app/makefile.mk
@@ -50,8 +50,6 @@ dummy:
.ELSE # "$(GUIBASE)"!="aqua"
-#CFLAGS+=-x objective-c++
-
SLOFILES= $(SLO)$/salinst.obj \
$(SLO)$/saldata.obj \
$(SLO)$/vclnsapp.obj \
diff --git a/vcl/aqua/source/window/salframeview.mm b/vcl/aqua/source/window/salframeview.mm
index 4768312ab1d1..68ea2c2062f2 100755
--- a/vcl/aqua/source/window/salframeview.mm
+++ b/vcl/aqua/source/window/salframeview.mm
@@ -1422,7 +1422,7 @@ private:
return 0;
}
-#ifdef MAC_OS_X_VERSION_10_5
+#if defined(MAC_OS_X_VERSION_10_5) && (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5)
/* build target 10.5 or greater */
- (NSInteger)conversationIdentifier
#else