summaryrefslogtreecommitdiff
path: root/winaccessibility
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2013-12-05 18:06:04 +0200
committerTor Lillqvist <tml@collabora.com>2013-12-05 18:11:09 +0200
commita0a903892ca93615c1460cebbfbac579999233f2 (patch)
treed3ad382b8db2a5a78be1291c444cee5c89eeb987 /winaccessibility
parent2ad141be95c9e8d60c874b013464ab057ab93d71 (diff)
Avoid multiple definitions of two lovingly copy-pasted functions
Multple external definitions of a symbol causes problems when linking statically, as for Android. Just make the functions static for now, as they are only used locally in the files where defined anyway. Change-Id: I8ddbaf01497c171bed4e15f6183ba43461c672d1
Diffstat (limited to 'winaccessibility')
-rw-r--r--winaccessibility/source/UAccCOM/AccTextBase.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/winaccessibility/source/UAccCOM/AccTextBase.cxx b/winaccessibility/source/UAccCOM/AccTextBase.cxx
index e63afe468a31..756bce9b8cc3 100644
--- a/winaccessibility/source/UAccCOM/AccTextBase.cxx
+++ b/winaccessibility/source/UAccCOM/AccTextBase.cxx
@@ -39,7 +39,7 @@ using namespace rtl;
// Construction/Destruction
//////////////////////////////////////////////////////////////////////
-OUString ReplaceFourChar(OUString oldOUString);
+static OUString ReplaceFourChar(OUString oldOUString);
CAccTextBase::CAccTextBase()
{}
@@ -962,7 +962,7 @@ STDMETHODIMP CAccTextBase::put_XInterface(hyper pXInterface)
LEAVE_PROTECTED_BLOCK
}
-OUString ReplaceOneChar(OUString oldOUString, OUString replacedChar, OUString replaceStr)
+static OUString ReplaceOneChar(OUString oldOUString, OUString replacedChar, OUString replaceStr)
{
int iReplace = -1;
iReplace = oldOUString.lastIndexOf(replacedChar);
@@ -975,9 +975,9 @@ OUString ReplaceOneChar(OUString oldOUString, OUString replacedChar, OUString re
}
}
return oldOUString;
-
}
-OUString ReplaceFourChar(OUString oldOUString)
+
+static OUString ReplaceFourChar(OUString oldOUString)
{
oldOUString = ReplaceOneChar(oldOUString, OUString("\\"), OUString("\\\\"));
oldOUString = ReplaceOneChar(oldOUString, OUString(";"), OUString("\\;"));
generated by cgit (git 2.34.1) at 2024-08-05 10:15:19 +0000
ld
diff --git a/expat/StaticLibrary_ascii_expat_xmlparse.mk b/expat/StaticLibrary_ascii_expat_xmlparse.mk
deleted file mode 100644
index c0eb92410059..000000000000
--- a/expat/StaticLibrary_ascii_expat_xmlparse.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_StaticLibrary_StaticLibrary,ascii_expat_xmlparse))
-
-$(eval $(call gb_StaticLibrary_set_warnings_not_errors,ascii_expat_xmlparse))
-
-$(eval $(call gb_StaticLibrary_use_unpacked,ascii_expat_xmlparse,expat))
-
-# no configure step on windows, no dependency
-ifneq ($(OS)$(COM),WNTMSC)
-$(eval $(call gb_StaticLibrary_use_external_project,ascii_expat_xmlparse,expat))
-endif
-
-$(eval $(call gb_StaticLibrary_set_include,ascii_expat_xmlparse,\
- -I$(call gb_UnpackedTarball_get_dir,expat) \
- $$(INCLUDE) \
-))
-
-ifeq ($(OS),MACOSX)
-ifneq ($(strip $(SYSBASE)),)
-$(eval $(call gb_StaticLibrary_add_defs,ascii_expat_xmlparse,\
- -DHAVE_MEMMOVE \
- -DHAVE_BCOPY \
-))
-endif
-endif
-
-ifeq ($(OS),WNT)
-$(eval $(call gb_StaticLibrary_add_defs,ascii_expat_xmlparse,\
- -DCOMPILED_FROM_DSP \
-))
-else
-$(eval $(call gb_StaticLibrary_add_defs,ascii_expat_xmlparse,\
- -DHAVE_EXPAT_CONFIG_H \
-))
-endif
-
-$(eval $(call gb_StaticLibrary_add_generated_cobjects,ascii_expat_xmlparse,\
- UnpackedTarball/expat/lib/xmlparse \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/expat/StaticLibrary_expat_xmltok.mk b/expat/StaticLibrary_expat.mk
index 616884474e1c..2501d72dbc7e 100644
--- a/expat/StaticLibrary_expat_xmltok.mk
+++ b/expat/StaticLibrary_expat.mk
@@ -7,25 +7,25 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_StaticLibrary_StaticLibrary,expat_xmltok))
+$(eval $(call gb_StaticLibrary_StaticLibrary,expat))
-$(eval $(call gb_StaticLibrary_set_warnings_not_errors,expat_xmltok))
+$(eval $(call gb_StaticLibrary_set_warnings_not_errors,expat))
-$(eval $(call gb_StaticLibrary_use_unpacked,expat_xmltok,expat))
+$(eval $(call gb_StaticLibrary_use_unpacked,expat,expat))
# no configure step on windows, no dependency
ifneq ($(OS)$(COM),WNTMSC)
-$(eval $(call gb_StaticLibrary_use_external_project,expat_xmltok,expat))
+$(eval $(call gb_StaticLibrary_use_external_project,expat,expat))
endif
-$(eval $(call gb_StaticLibrary_set_include,expat_xmltok,\
+$(eval $(call gb_StaticLibrary_set_include,expat,\
-I$(call gb_UnpackedTarball_get_dir,expat) \
$$(INCLUDE) \
))
ifeq ($(OS),MACOSX)
ifneq ($(strip $(SYSBASE)),)
-$(eval $(call gb_StaticLibrary_add_defs,expat_xmltok,\
+$(eval $(call gb_StaticLibrary_add_defs,expat,\
-DHAVE_MEMMOVE \
-DHAVE_BCOPY \
))
@@ -33,18 +33,19 @@ endif
endif
ifeq ($(OS),WNT)
-$(eval $(call gb_StaticLibrary_add_defs,expat_xmltok,\
+$(eval $(call gb_StaticLibrary_add_defs,expat,\
-DCOMPILED_FROM_DSP \
))
else
-$(eval $(call gb_StaticLibrary_add_defs,expat_xmltok,\
+$(eval $(call gb_StaticLibrary_add_defs,expat,\
-DHAVE_EXPAT_CONFIG_H \
))
endif
-$(eval $(call gb_StaticLibrary_add_generated_cobjects,expat_xmltok,\
- UnpackedTarball/expat/lib/xmltok \
+$(eval $(call gb_StaticLibrary_add_generated_cobjects,expat,\
+ UnpackedTarball/expat/lib/xmlparse \
UnpackedTarball/expat/lib/xmlrole \
+ UnpackedTarball/expat/lib/xmltok \
))
# vim: set noet sw=4 ts=4:
diff --git a/expat/StaticLibrary_expat_xmlparse.mk b/expat/StaticLibrary_expat_utf16.mk
index 39f79d0378d7..0ab3d1f25e61 100644
--- a/expat/StaticLibrary_expat_xmlparse.mk
+++ b/expat/StaticLibrary_expat_utf16.mk
@@ -7,29 +7,29 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_StaticLibrary_StaticLibrary,expat_xmlparse))
+$(eval $(call gb_StaticLibrary_StaticLibrary,expat_utf16))
-$(eval $(call gb_StaticLibrary_set_warnings_not_errors,expat_xmlparse))
+$(eval $(call gb_StaticLibrary_set_warnings_not_errors,expat_utf16))
-$(eval $(call gb_StaticLibrary_use_unpacked,expat_xmlparse,expat))
+$(eval $(call gb_StaticLibrary_use_unpacked,expat_utf16,expat))
# no configure step on windows, no dependency
ifneq ($(OS)$(COM),WNTMSC)
-$(eval $(call gb_StaticLibrary_use_external_project,expat_xmlparse,expat))
+$(eval $(call gb_StaticLibrary_use_external_project,expat_utf16,expat))
endif
-$(eval $(call gb_StaticLibrary_add_defs,expat_xmlparse,\
+$(eval $(call gb_StaticLibrary_add_defs,expat_utf16,\
-DXML_UNICODE \
))
-$(eval $(call gb_StaticLibrary_set_include,expat_xmlparse,\
+$(eval $(call gb_StaticLibrary_set_include,expat_utf16,\
-I$(call gb_UnpackedTarball_get_dir,expat) \
$$(INCLUDE) \
))
ifeq ($(OS),MACOSX)
ifneq ($(strip $(SYSBASE)),)
-$(eval $(call gb_StaticLibrary_add_defs,expat_xmlparse,\
+$(eval $(call gb_StaticLibrary_add_defs,expat_utf16,\
-DHAVE_MEMMOVE \
-DHAVE_BCOPY \
))
@@ -37,17 +37,19 @@ endif
endif
ifeq ($(OS),WNT)
-$(eval $(call gb_StaticLibrary_add_defs,expat_xmlparse,\
+$(eval $(call gb_StaticLibrary_add_defs,expat_utf16,\
-DCOMPILED_FROM_DSP \
))
else
-$(eval $(call gb_StaticLibrary_add_defs,expat_xmlparse,\
+$(eval $(call gb_StaticLibrary_add_defs,expat_utf16,\
-DHAVE_EXPAT_CONFIG_H \
))
endif
-$(eval $(call gb_StaticLibrary_add_generated_cobjects,expat_xmlparse,\
+$(eval $(call gb_StaticLibrary_add_generated_cobjects,expat_utf16,\
UnpackedTarball/expat/lib/unicode_xmlparse \
+ UnpackedTarball/expat/lib/unicode_xmlrole \
+ UnpackedTarball/expat/lib/unicode_xmltok \
))
# vim: set noet sw=4 ts=4:
diff --git a/expat/UnpackedTarball_expat.mk b/expat/UnpackedTarball_expat.mk
index d9fb82cefb54..a4daa51ea173 100644
--- a/expat/UnpackedTarball_expat.mk
+++ b/expat/UnpackedTarball_expat.mk
@@ -23,6 +23,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,expat,\
# on windows 64 bit platform we need to link it twice:
# with $(LINK_X64_BINARY) and with $(gb_LINK).
$(eval $(call gb_UnpackedTarball_set_post_action,expat,\
+ cp lib/xmltok.c lib/unicode_xmltok.c && \
+ cp lib/xmlrole.c lib/unicode_xmlrole.c && \
cp lib/xmlparse.c lib/unicode_xmlparse.c \
$(if $(filter $(BUILD_X64),TRUE), && \
cp lib/xmlparse.c lib/xmlparse_x64.c && \
generated by cgit (git 2.34.1) at 2024-08-05 10:15:18 +0000