Kaydet (Commit) 3e5c8670 authored tarafından Matúš Kukan's avatar Matúš Kukan

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
üst d2aa4ebb
......@@ -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
#
......
......@@ -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 \
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment