summaryrefslogtreecommitdiff
path: root/sal/rtl/source/makefile.mk
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2006-01-31 17:30:13 +0000
committerKurt Zenker <kz@openoffice.org>2006-01-31 17:30:13 +0000
commit3f2ac341fb1684fb35b3afcb920f9777d70b34e8 (patch)
tree20d6e79bffd7bf36290af9a3ef28c6391f044a3d /sal/rtl/source/makefile.mk
parent7ebc1e69c3a69186bceefda9a58ea40c502a750f (diff)
INTEGRATION: CWS configure14 (1.22.56); FILE MERGED
2006/01/07 17:44:22 rene 1.22.56.1: #i59160# allow usage of tcmalloc and system-malloc
Diffstat (limited to 'sal/rtl/source/makefile.mk')
-rw-r--r--sal/rtl/source/makefile.mk8
1 files changed, 6 insertions, 2 deletions
diff --git a/sal/rtl/source/makefile.mk b/sal/rtl/source/makefile.mk
index a99937c37120..54a7f55cc327 100644
--- a/sal/rtl/source/makefile.mk
+++ b/sal/rtl/source/makefile.mk
@@ -4,9 +4,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.22 $
+# $Revision: 1.23 $
#
-# last change: $Author: rt $ $Date: 2005-09-08 16:03:20 $
+# last change: $Author: kz $ $Date: 2006-01-31 18:30:13 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@@ -47,6 +47,10 @@ PROJECTPCHSOURCE=cont_pch
.INCLUDE : settings.mk
+.IF "$(ALLOC)" == "SYS_ALLOC" || "$(ALLOC)" == "TCMALLOC"
+CDEFS+= -DFORCE_SYSALLOC
+.ENDIF
+
# --- Files --------------------------------------------------------
.IF "$(header)" == ""