diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-10-11 17:16:48 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2019-10-12 15:33:16 +0200 |
| commit | 7e75592add27d2585ca4189fba85dfae6879aeef (patch) | |
| tree | ecf90c8498d9abe3a4d9ef8e638463484071bc0a | |
| parent | b18ebc16f7ad31317cf366d7433da513cc3c34c3 (diff) | |
rtl/stringconcat.hxx is not part of the URE interface
(and #include's of it in include/rtl/*.hxx are already guarded with
LIBO_INTERNAL_ONLY)
Change-Id: I9224f71a244a69ef69406ea3a5879b66b3cae3a3
Reviewed-on: https://gerrit.libreoffice.org/80666
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
| -rw-r--r-- | include/rtl/stringconcat.hxx | 6 | ||||
| -rw-r--r-- | odk/Package_odk_headers.mk | 1 |
2 files changed, 2 insertions, 5 deletions
diff --git a/include/rtl/stringconcat.hxx b/include/rtl/stringconcat.hxx index 2dbde557b7df..049b5ab302ba 100644 --- a/include/rtl/stringconcat.hxx +++ b/include/rtl/stringconcat.hxx @@ -10,6 +10,8 @@ #ifndef INCLUDED_RTL_STRINGCONCAT_HXX #define INCLUDED_RTL_STRINGCONCAT_HXX +// This file is only included from LIBO_INTERNAL_ONLY + #include "rtl/stringutils.hxx" #include "rtl/string.h" #include "rtl/ustring.h" @@ -21,8 +23,6 @@ #include <string.h> -#ifdef LIBO_INTERNAL_ONLY // "RTL_FAST_STRING" - #if defined RTL_STRING_UNITTEST_CONCAT extern bool rtl_string_unittest_invalid_concat; #endif @@ -480,5 +480,3 @@ struct ToStringHelper< OUStringNumber< T > > } // namespace #endif - -#endif diff --git a/odk/Package_odk_headers.mk b/odk/Package_odk_headers.mk index 40e0fb83d0f8..cc52b9719f9a 100644 --- a/odk/Package_odk_headers.mk +++ b/odk/Package_odk_headers.mk @@ -136,7 +136,6 @@ $(eval $(call gb_Package_add_files_with_dir,odk_headers,$(SDKDIRNAME)/include,\ rtl/strbuf.hxx \ rtl/string.h \ rtl/string.hxx \ - rtl/stringconcat.hxx \ rtl/stringutils.hxx \ rtl/tencinfo.h \ rtl/textcvt.h \ |