[Libreoffice-commits] .: desktop/Library_sofficeapp.mk sc/Library_sc.mk solenv/gbuild

[Libreoffice Gerrit user]

 desktop/Library_sofficeapp.mk |    4 ----
 sc/Library_sc.mk              |    4 ----
 solenv/gbuild/gbuild.mk       |    4 ++++
 3 files changed, 4 insertions(+), 8 deletions(-)

New commits:
commit 3e5c86705120ec5144db67104036f2fa5790be21
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Thu Sep 27 09:50:24 2012 +0200

    tubes: fix glibc detected memory corruption in ScDocShell
    
    ENABLE_TELEPATHY was used in docsh.hxx but not defined consistently.
    Add global define to gbuild.
    
    Change-Id: I9746297a0be0e01573e336d4ee237bcc14d2d47d

diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk
index 607d751..9e4fa37 100644
--- a/desktop/Library_sofficeapp.mk
+++ b/desktop/Library_sofficeapp.mk
@@ -90,10 +90,6 @@ $(eval $(call gb_Library_add_exception_objects,sofficeapp,\
 
 ifeq ($(ENABLE_TELEPATHY),TRUE)
 $(eval $(call gb_Library_use_libraries,sofficeapp,tubes))
-
-$(eval $(call gb_Library_add_defs,sofficeapp,\
-    -DENABLE_TELEPATHY \
-))
 endif
 
 #
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 345c7b5..bbbab8f 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -49,10 +49,6 @@ $(eval $(call gb_Library_use_externals,sc,\
 ifeq ($(ENABLE_TELEPATHY),TRUE)
 $(eval $(call gb_Library_use_libraries,sc,tubes))
 
-$(eval $(call gb_Library_add_defs,sc,\
-	-DENABLE_TELEPATHY \
-))
-
 $(eval $(call gb_Library_add_exception_objects,sc,\
 	sc/source/ui/collab/sccollaboration \
 	sc/source/ui/collab/sendfunc \
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index aeb59a8..0f11ea0 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -278,6 +278,10 @@ ifeq ($(HAVE_THREADSAFE_STATICS),TRUE)
 gb_GLOBALDEFS += -DHAVE_THREADSAFE_STATICS
 endif
 
+ifeq ($(ENABLE_TELEPATHY),TRUE)
+gb_GLOBALDEFS += -DENABLE_TELEPATHY
+endif
+
 gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS))
 
 include $(GBUILDDIR)/Deliver.mk