diff --git a/.gitignore b/.gitignore index f0e519a..4b3a971 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ .DS_Store /.swiftpm /.build +/build /Packages /*.xcodeproj xcuserdata/ diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..4aa7313 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,85 @@ +##===----------------------------------------------------------------------===## +## +## This source file is part of the Swift open source project +## +## Copyright (c) 2024 Apple Inc. and the Swift project authors +## Licensed under Apache License v2.0 +## +## See LICENSE.txt for license information +## See CONTRIBUTORS.md for the list of Swift project authors +## +## SPDX-License-Identifier: Apache-2.0 +## +##===----------------------------------------------------------------------===## + +cmake_minimum_required(VERSION 3.24) + +project(SwiftFoundationICU + LANGUAGES CXX Swift) + +set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD_REQUIRED ON) + +list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/modules) +set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) +set(CMAKE_Swift_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/swift) + +# Build flags +add_compile_definitions( + $<$:U_ATTRIBUTE_DEPRECATED=""> + $<$:U_SHOW_CPLUSPLUS_API=1> + $<$:U_SHOW_INTERNAL_API=1> + $<$:U_STATIC_IMPLEMENTATION> + $<$:U_TIMEZONE_PACKAGE="icutz44l"> + $<$:FORTIFY_SOURCE=2> + $<$:STD_INSPIRED> + $<$:MAC_OS_X_VERSION_MIN_REQUIRED=101500> + $<$:U_HAVE_STRTOD_L=1> + $<$:U_HAVE_XLOCALE_H=1> + $<$:U_HAVE_STRING_VIEW=1> + $<$:U_DISABLE_RENAMING=1> + $<$:U_COMMON_IMPLEMENTATION> + $<$:ICU_DATA_DIR="/usr/share/icu"> + $<$:USE_PACKAGE_DATA=1> + $<$:APPLE_ICU_CHANGES=1>) + +# Window specific settings +if(CMAKE_SYSTEM_NAME STREQUAL Windows) + add_compile_definitions( + $<$:U_TIMEZONE=_timezone> + $<$:_CRT_SECURE_NO_DEPRECATE> + $<$:U_PLATFORM_USES_ONLY_WIN32_API>) +else() + add_compile_definitions( + $<$:U_TIMEZONE=timezone>) +endif() +# WASI specific settings +if(CMAKE_SYSTEM_NAME STREQUAL WASI) + add_compile_definitions( + $<$:U_HAVE_TZSET=0> + $<$:U_HAVE_TZNAME=0> + $<$:U_HAVE_TIMEZONE=0> + $<$:_WASI_EMULATED_SIGNAL> + $<$:_WASI_EMULATED_MMAN>) + add_link_options("-Lwasi-emulated-signal") + add_link_options("-Lwasi-emulated-mman") +endif() + +if(BUILD_SHARED_LIBS) + set(install_directory swift) +else() + set(install_directory swift_static) +endif() + +if(NOT SWIFT_SYSTEM_NAME) + if(CMAKE_SYSTEM_NAME STREQUAL Darwin) + set(SWIFT_SYSTEM_NAME macosx) + else() + set(SWIFT_SYSTEM_NAME "$") + endif() +endif() + +add_subdirectory(icuSources) +add_subdirectory(cmake/modules) diff --git a/Package.swift b/Package.swift index 30d6c34..7e918fb 100644 --- a/Package.swift +++ b/Package.swift @@ -38,7 +38,15 @@ var buildSettings: [CXXSetting] = [ // Where data are stored .define("ICU_DATA_DIR", to: "\"/usr/share/icu/\""), .define("USE_PACKAGE_DATA", to: "1"), - .define("APPLE_ICU_CHANGES", to: "1") + .define("APPLE_ICU_CHANGES", to: "1"), + + .headerSearchPath("common"), + .headerSearchPath("io"), + .headerSearchPath("i18n"), + .headerSearchPath("include"), + .define("U_I18N_IMPLEMENTATION"), + .define("SWIFT_PACKAGE", to: "1", .when(platforms: [.linux])), + .define("U_IO_IMPLEMENTATION"), ] #if os(Windows) @@ -48,30 +56,6 @@ buildSettings.append(contentsOf: [ ]) #endif -let commonBuildSettings: [CXXSetting] = buildSettings.appending([ - .headerSearchPath("."), -]) - -let i18nBuildSettings: [CXXSetting] = buildSettings.appending([ - .define("U_I18N_IMPLEMENTATION"), - .define("SWIFT_PACKAGE", to: "1", .when(platforms: [.linux])), - .headerSearchPath("../common"), - .headerSearchPath("."), -]) - -let ioBuildSettings: [CXXSetting] = buildSettings.appending([ - .define("U_IO_IMPLEMENTATION"), - .headerSearchPath("../common"), - .headerSearchPath("../i18n"), - .headerSearchPath("."), -]) - -let stubDataBuildSettings: [CXXSetting] = buildSettings.appending([ - .headerSearchPath("../common"), - .headerSearchPath("../i18n"), - .headerSearchPath("."), -]) - let linkerSettings: [LinkerSetting] = [ .linkedLibrary("wasi-emulated-signal", .when(platforms: [.wasi])), .linkedLibrary("wasi-emulated-mman", .when(platforms: [.wasi])), @@ -82,62 +66,19 @@ let package = Package( products: [ .library( name: "_FoundationICU", - targets: ["_FoundationICU"]), - .library( - name: "_FoundationICUCommon", - targets: ["_FoundationICUCommon"]), - .library( - name: "_FoundationICUI18N", - targets: ["_FoundationICUI18N"]), - .library( - name: "_FoundationICUIO", - targets: ["_FoundationICUIO"]), + targets: [ + "_FoundationICU" + ] + ) ], targets: [ .target( name: "_FoundationICU", - dependencies: [ - "_FoundationICUCommon", - "_FoundationICUI18N", - "_FoundationICUIO", - "_FoundationICUStubData" - ], - path: "swift/FoundationICU"), - .target( - name: "_FoundationICUCommon", - path: "icuSources/common", - publicHeadersPath: "include", - cxxSettings: commonBuildSettings), - .target( - name: "_FoundationICUI18N", - dependencies: ["_FoundationICUCommon"], - path: "icuSources/i18n", - publicHeadersPath: "include", - cxxSettings: i18nBuildSettings), - .target( - name: "_FoundationICUIO", - dependencies: ["_FoundationICUCommon", "_FoundationICUI18N"], - path: "icuSources/io", - publicHeadersPath: "include", - cxxSettings: ioBuildSettings), - .target( - name: "_FoundationICUStubData", - dependencies: ["_FoundationICUCommon"], - path: "icuSources/stubdata", - publicHeadersPath: ".", - cxxSettings: stubDataBuildSettings), + path: "icuSources", + exclude: ["stubdata"], + cxxSettings: buildSettings, + linkerSettings: linkerSettings + ) ], cxxLanguageStandard: .cxx14 ) - -for target in package.targets { - target.linkerSettings = linkerSettings -} - -fileprivate extension Array { - func appending(_ other: Self) -> Self { - var me = self - me.append(contentsOf: other) - return me - } -} diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt new file mode 100644 index 0000000..eb12409 --- /dev/null +++ b/cmake/modules/CMakeLists.txt @@ -0,0 +1,24 @@ +##===----------------------------------------------------------------------===## +## +## This source file is part of the Swift open source project +## +## Copyright (c) 2024 Apple Inc. and the Swift project authors +## Licensed under Apache License v2.0 +## +## See LICENSE.txt for license information +## See CONTRIBUTORS.md for the list of Swift project authors +## +## SPDX-License-Identifier: Apache-2.0 +## +##===----------------------------------------------------------------------===## + +set(SWIFT_FOUNDATION_ICU_EXPORTS_FILE ${CMAKE_CURRENT_BINARY_DIR}/SwiftFoundationICUExports.cmake) + +configure_file(SwiftFoundationICUConfig.cmake.in + ${CMAKE_CURRENT_BINARY_DIR}/SwiftFoundationICUConfig.cmake) + +get_property(SWIFT_FOUNDATION_ICU_EXPORTS GLOBAL PROPERTY SWIFT_FOUNDATION_ICU_EXPORTS) +export(TARGETS ${SWIFT_FOUNDATION_ICU_EXPORTS} + NAMESPACE SwiftFoundationICU:: + FILE ${SWIFT_FOUNDATION_ICU_EXPORTS_FILE} + EXPORT_LINK_INTERFACE_LIBRARIES) diff --git a/cmake/modules/SwiftFoundationICUConfig.cmake.in b/cmake/modules/SwiftFoundationICUConfig.cmake.in new file mode 100644 index 0000000..826492e --- /dev/null +++ b/cmake/modules/SwiftFoundationICUConfig.cmake.in @@ -0,0 +1,17 @@ +##===----------------------------------------------------------------------===## +## +## This source file is part of the Swift open source project +## +## Copyright (c) 2024 Apple Inc. and the Swift project authors +## Licensed under Apache License v2.0 +## +## See LICENSE.txt for license information +## See CONTRIBUTORS.md for the list of Swift project authors +## +## SPDX-License-Identifier: Apache-2.0 +## +##===----------------------------------------------------------------------===## + +if(NOT TARGET SwiftFoundationICU) + include(@SWIFT_FOUNDATION_ICU_EXPORTS_FILE@) +endif() diff --git a/icuSources/CMakeLists.txt b/icuSources/CMakeLists.txt new file mode 100644 index 0000000..189342b --- /dev/null +++ b/icuSources/CMakeLists.txt @@ -0,0 +1,45 @@ +##===----------------------------------------------------------------------===## +## +## This source file is part of the SwiftFoundation open source project +## +## Copyright (c) 2024 Apple Inc. and the SwiftFoundation project authors +## Licensed under Apache License v2.0 +## +## See LICENSE.txt for license information +## See CONTRIBUTORS.md for the list of SwiftFoundation project authors +## +## SPDX-License-Identifier: Apache-2.0 +## +##===----------------------------------------------------------------------===## + +add_library(_FoundationICU) + +target_include_directories(_FoundationICU + PUBLIC + include/) + +add_subdirectory(common) +add_subdirectory(i18n) +add_subdirectory(io) + +target_link_libraries(_FoundationICU PRIVATE stdc++) +target_compile_definitions(_FoundationICU PRIVATE U_I18N_IMPLEMENTATION U_IO_IMPLEMENTATION) +if(CMAKE_SYSTEM_NAME STREQUAL Linux) + target_compile_definitions(_FoundationICU PRIVATE SWIFT_PACKAGE=1) +endif() +set_target_properties(_FoundationICU PROPERTIES + INSTALL_RPATH "$ORIGIN") + +# Install binary +install(TARGETS _FoundationICU + ARCHIVE DESTINATION lib/${install_directory}/${SWIFT_SYSTEM_NAME} + LIBRARY DESTINATION lib/${install_directory}/${SWIFT_SYSTEM_NAME} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + +# Install headers +install(DIRECTORY + include/ + DESTINATION + lib/${install_directory}) + +set_property(GLOBAL APPEND PROPERTY SWIFT_FOUNDATION_ICU_EXPORTS _FoundationICU) diff --git a/icuSources/common/CMakeLists.txt b/icuSources/common/CMakeLists.txt new file mode 100644 index 0000000..e66b898 --- /dev/null +++ b/icuSources/common/CMakeLists.txt @@ -0,0 +1,231 @@ +##===----------------------------------------------------------------------===## +## +## This source file is part of the SwiftFoundation open source project +## +## Copyright (c) 2024 Apple Inc. and the SwiftFoundation project authors +## Licensed under Apache License v2.0 +## +## See LICENSE.txt for license information +## See CONTRIBUTORS.md for the list of SwiftFoundation project authors +## +## SPDX-License-Identifier: Apache-2.0 +## +##===----------------------------------------------------------------------===## + +target_include_directories(_FoundationICU PRIVATE .) + +target_sources(_FoundationICU + PRIVATE + aaplbfct.cpp + appendable.cpp + bmpset.cpp + brkeng.cpp + brkiter.cpp + bytesinkutil.cpp + bytestream.cpp + bytestrie.cpp + bytestriebuilder.cpp + bytestrieiterator.cpp + caniter.cpp + characterproperties.cpp + chariter.cpp + charstr.cpp + cmemory.cpp + cpputils.h + cstr.cpp + cstring.cpp + cwchar.cpp + dictbe.cpp + dictionarydata.cpp + dtintrv.cpp + edits.cpp + emojiprops.cpp + errorcode.cpp + filteredbrk.cpp + filterednormalizer2.cpp + icudataver.cpp + icuplug.cpp + icu_packaged_data.cpp + loadednormalizer2impl.cpp + localebuilder.cpp + localematcher.cpp + localeprioritylist.cpp + localsvc.cpp + locavailable.cpp + locbased.cpp + locdispnames.cpp + locdistance.cpp + locdspnm.cpp + locid.cpp + loclikely.cpp + loclikelysubtags.cpp + locmap.cpp + locresdata.cpp + locutil.cpp + lsr.cpp + lstmbe.cpp + messagepattern.cpp + normalizer2.cpp + normalizer2impl.cpp + normlzr.cpp + parsepos.cpp + patternprops.cpp + pluralmap.cpp + propname.cpp + propsvec.cpp + punycode.cpp + putil.cpp + rbbi.cpp + rbbi57.cpp + rbbi_cache.cpp + rbbidata.cpp + rbbidata57.cpp + rbbinode.cpp + rbbirb.cpp + rbbirb57.cpp + rbbiscan.cpp + rbbiscan57.cpp + rbbisetb.cpp + rbbisetb57.cpp + rbbistbl.cpp + rbbistbl57.cpp + rbbitblb.cpp + rbbitblb57.cpp + rbtok.cpp + resbund.cpp + resbund_cnv.cpp + resource.cpp + restrace.cpp + ruleiter.cpp + schriter.cpp + serv.cpp + servlk.cpp + servlkf.cpp + servls.cpp + servnotf.cpp + servrbf.cpp + servslkf.cpp + sharedobject.cpp + simpleformatter.cpp + static_unicode_sets.cpp + stringpiece.cpp + stringtriebuilder.cpp + ualoc.cpp + uarrsort.cpp + ubidi.cpp + ubidi_props.cpp + ubidiln.cpp + ubiditransform.cpp + ubidiwrt.cpp + ubrk.cpp + ucase.cpp + ucasemap.cpp + ucasemap_titlecase_brkiter.cpp + ucat.cpp + uchar.cpp + ucharstrie.cpp + ucharstriebuilder.cpp + ucharstrieiterator.cpp + uchriter.cpp + ucln_cmn.cpp + ucmndata.cpp + ucnv.cpp + ucnv2022.cpp + ucnv_bld.cpp + ucnv_cb.cpp + ucnv_cnv.cpp + ucnv_ct.cpp + ucnv_err.cpp + ucnv_ext.cpp + ucnv_io.cpp + ucnv_lmb.cpp + ucnv_set.cpp + ucnv_u16.cpp + ucnv_u32.cpp + ucnv_u7.cpp + ucnv_u8.cpp + ucnvbocu.cpp + ucnvdisp.cpp + ucnvhz.cpp + ucnvisci.cpp + ucnvlat1.cpp + ucnvmbcs.cpp + ucnvscsu.cpp + ucnvsel.cpp + ucol_swp.cpp + ucptrie.cpp + ucurr.cpp + udata.cpp + udatamem.cpp + udataswp.cpp + uenum.cpp + uhash.cpp + uhash_us.cpp + uidna.cpp + uinit.cpp + uinvchar.cpp + uiter.cpp + ulist.cpp + uloc.cpp + uloc_keytype.cpp + uloc_tag.cpp + ulocdata.cpp + umapfile.cpp + umath.cpp + umutablecptrie.cpp + umutex.cpp + unames.cpp + unifiedcache.cpp + unifilt.cpp + unifunct.cpp + uniset.cpp + uniset_closure.cpp + uniset_props.cpp + unisetspan.cpp + unistr.cpp + unistr_case.cpp + unistr_case_locale.cpp + unistr_cnv.cpp + unistr_props.cpp + unistr_titlecase_brkiter.cpp + unorm.cpp + unormcmp.cpp + uobject.cpp + uprops.cpp + urbtok.cpp + ures_cnv.cpp + uresbund.cpp + uresdata.cpp + usc_impl.cpp + uscript.cpp + uscript_props.cpp + uset.cpp + uset_props.cpp + usetiter.cpp + ushape.cpp + usprep.cpp + ustack.cpp + ustr_cnv.cpp + ustr_titlecase_brkiter.cpp + ustr_wcs.cpp + ustrcase.cpp + ustrcase_locale.cpp + ustrenum.cpp + ustrfmt.cpp + ustring.cpp + ustrtrns.cpp + utext.cpp + utf_impl.cpp + util.cpp + util_props.cpp + utrace.cpp + utrie.cpp + utrie2.cpp + utrie2_builder.cpp + utrie_swap.cpp + uts46.cpp + utypes.cpp + uvector.cpp + uvectr32.cpp + uvectr64.cpp + wintz.cpp) diff --git a/icuSources/common/aaplbfct.cpp b/icuSources/common/aaplbfct.cpp index 10dff20..5edda40 100644 --- a/icuSources/common/aaplbfct.cpp +++ b/icuSources/common/aaplbfct.cpp @@ -8,17 +8,17 @@ */ #define __STDC_LIMIT_MACROS 1 -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_BREAK_ITERATION && U_PLATFORM_IS_DARWIN_BASED #include "brkeng.h" #include "dictbe.h" #include "aaplbfct.h" -#include "unicode/uscript.h" -#include "unicode/uniset.h" -#include "unicode/ucnv.h" -#include "unicode/uchar.h" +#include <_foundation_unicode/uscript.h> +#include <_foundation_unicode/uniset.h> +#include <_foundation_unicode/ucnv.h> +#include <_foundation_unicode/uchar.h> #include #include #include diff --git a/icuSources/common/aaplbfct.h b/icuSources/common/aaplbfct.h index 9778c5f..78f004d 100644 --- a/icuSources/common/aaplbfct.h +++ b/icuSources/common/aaplbfct.h @@ -10,10 +10,10 @@ #ifndef AAPLBFCT_H #define AAPLBFCT_H -#include "unicode/utypes.h" -#include "unicode/uobject.h" -#include "unicode/utext.h" -#include "unicode/uscript.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/uobject.h> +#include <_foundation_unicode/utext.h> +#include <_foundation_unicode/uscript.h> #include "brkeng.h" #include "dictbe.h" diff --git a/icuSources/common/appendable.cpp b/icuSources/common/appendable.cpp index f9b2018..9672dcb 100644 --- a/icuSources/common/appendable.cpp +++ b/icuSources/common/appendable.cpp @@ -14,9 +14,9 @@ * created by: Markus W. Scherer */ -#include "unicode/utypes.h" -#include "unicode/appendable.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/appendable.h> +#include <_foundation_unicode/utf16.h> U_NAMESPACE_BEGIN diff --git a/icuSources/common/bmpset.cpp b/icuSources/common/bmpset.cpp index 14ab894..dbf595d 100644 --- a/icuSources/common/bmpset.cpp +++ b/icuSources/common/bmpset.cpp @@ -16,10 +16,10 @@ * created by: Markus W. Scherer */ -#include "unicode/utypes.h" -#include "unicode/uniset.h" -#include "unicode/utf8.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/uniset.h> +#include <_foundation_unicode/utf8.h> +#include <_foundation_unicode/utf16.h> #include "cmemory.h" #include "bmpset.h" #include "uassert.h" diff --git a/icuSources/common/bmpset.h b/icuSources/common/bmpset.h index e1982ac..4b11a8a 100644 --- a/icuSources/common/bmpset.h +++ b/icuSources/common/bmpset.h @@ -19,8 +19,8 @@ #ifndef __BMPSET_H__ #define __BMPSET_H__ -#include "unicode/utypes.h" -#include "unicode/uniset.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/uniset.h> U_NAMESPACE_BEGIN diff --git a/icuSources/common/brkeng.cpp b/icuSources/common/brkeng.cpp index bd6abbb..cbed5ba 100644 --- a/icuSources/common/brkeng.cpp +++ b/icuSources/common/brkeng.cpp @@ -7,20 +7,20 @@ ************************************************************************************ */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_BREAK_ITERATION -#include "unicode/uchar.h" -#include "unicode/uniset.h" -#include "unicode/chariter.h" -#include "unicode/ures.h" -#include "unicode/udata.h" -#include "unicode/putil.h" -#include "unicode/ustring.h" -#include "unicode/uscript.h" -#include "unicode/ucharstrie.h" -#include "unicode/bytestrie.h" +#include <_foundation_unicode/uchar.h> +#include <_foundation_unicode/uniset.h> +#include <_foundation_unicode/chariter.h> +#include <_foundation_unicode/ures.h> +#include <_foundation_unicode/udata.h> +#include <_foundation_unicode/putil.h> +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/uscript.h> +#include <_foundation_unicode/ucharstrie.h> +#include <_foundation_unicode/bytestrie.h> #include "brkeng.h" #include "cmemory.h" diff --git a/icuSources/common/brkeng.h b/icuSources/common/brkeng.h index 127ba59..c8504a1 100644 --- a/icuSources/common/brkeng.h +++ b/icuSources/common/brkeng.h @@ -10,10 +10,10 @@ #ifndef BRKENG_H #define BRKENG_H -#include "unicode/utypes.h" -#include "unicode/uobject.h" -#include "unicode/utext.h" -#include "unicode/uscript.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/uobject.h> +#include <_foundation_unicode/utext.h> +#include <_foundation_unicode/uscript.h> U_NAMESPACE_BEGIN diff --git a/icuSources/common/brkiter.cpp b/icuSources/common/brkiter.cpp index c200045..7bd0479 100644 --- a/icuSources/common/brkiter.cpp +++ b/icuSources/common/brkiter.cpp @@ -20,16 +20,16 @@ // This file was generated from the java source file BreakIterator.java // ***************************************************************************** -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_BREAK_ITERATION -#include "unicode/rbbi.h" -#include "unicode/brkiter.h" -#include "unicode/udata.h" -#include "unicode/ures.h" -#include "unicode/ustring.h" -#include "unicode/filteredbrk.h" +#include <_foundation_unicode/rbbi.h> +#include <_foundation_unicode/brkiter.h> +#include <_foundation_unicode/udata.h> +#include <_foundation_unicode/ures.h> +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/filteredbrk.h> #include "bytesinkutil.h" #include "ucln_cmn.h" #include "cstring.h" diff --git a/icuSources/common/bytesinkutil.cpp b/icuSources/common/bytesinkutil.cpp index a32254a..b593144 100644 --- a/icuSources/common/bytesinkutil.cpp +++ b/icuSources/common/bytesinkutil.cpp @@ -4,12 +4,12 @@ // bytesinkutil.cpp // created: 2017sep14 Markus W. Scherer -#include "unicode/utypes.h" -#include "unicode/bytestream.h" -#include "unicode/edits.h" -#include "unicode/stringoptions.h" -#include "unicode/utf8.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/bytestream.h> +#include <_foundation_unicode/edits.h> +#include <_foundation_unicode/stringoptions.h> +#include <_foundation_unicode/utf8.h> +#include <_foundation_unicode/utf16.h> #include "bytesinkutil.h" #include "charstr.h" #include "cmemory.h" @@ -80,7 +80,7 @@ ByteSinkUtil::appendCodePoint(int32_t length, UChar32 c, ByteSink &sink, Edits * namespace { -// See unicode/utf8.h U8_APPEND_UNSAFE(). +// See _foundation_unicode/utf8.h U8_APPEND_UNSAFE(). inline uint8_t getTwoByteLead(UChar32 c) { return (uint8_t)((c >> 6) | 0xc0); } inline uint8_t getTwoByteTrail(UChar32 c) { return (uint8_t)((c & 0x3f) | 0x80); } diff --git a/icuSources/common/bytesinkutil.h b/icuSources/common/bytesinkutil.h index 929c71f..2ac578f 100644 --- a/icuSources/common/bytesinkutil.h +++ b/icuSources/common/bytesinkutil.h @@ -7,9 +7,9 @@ #ifndef BYTESINKUTIL_H #define BYTESINKUTIL_H -#include "unicode/utypes.h" -#include "unicode/bytestream.h" -#include "unicode/edits.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/bytestream.h> +#include <_foundation_unicode/edits.h> #include "cmemory.h" #include "uassert.h" diff --git a/icuSources/common/bytestream.cpp b/icuSources/common/bytestream.cpp index c14f206..55dd9a6 100644 --- a/icuSources/common/bytestream.cpp +++ b/icuSources/common/bytestream.cpp @@ -6,8 +6,8 @@ // Copyright 2007 Google Inc. All Rights Reserved. // Author: sanjay@google.com (Sanjay Ghemawat) -#include "unicode/utypes.h" -#include "unicode/bytestream.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/bytestream.h> #include "cmemory.h" U_NAMESPACE_BEGIN diff --git a/icuSources/common/bytestrie.cpp b/icuSources/common/bytestrie.cpp index c272cc4..220a1cc 100644 --- a/icuSources/common/bytestrie.cpp +++ b/icuSources/common/bytestrie.cpp @@ -14,10 +14,10 @@ * created by: Markus W. Scherer */ -#include "unicode/utypes.h" -#include "unicode/bytestream.h" -#include "unicode/bytestrie.h" -#include "unicode/uobject.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/bytestream.h> +#include <_foundation_unicode/bytestrie.h> +#include <_foundation_unicode/uobject.h> #include "cmemory.h" #include "uassert.h" diff --git a/icuSources/common/bytestriebuilder.cpp b/icuSources/common/bytestriebuilder.cpp index ac7d3d8..80b9f90 100644 --- a/icuSources/common/bytestriebuilder.cpp +++ b/icuSources/common/bytestriebuilder.cpp @@ -14,10 +14,10 @@ * created by: Markus W. Scherer */ -#include "unicode/utypes.h" -#include "unicode/bytestrie.h" -#include "unicode/bytestriebuilder.h" -#include "unicode/stringpiece.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/bytestrie.h> +#include <_foundation_unicode/bytestriebuilder.h> +#include <_foundation_unicode/stringpiece.h> #include "charstr.h" #include "cmemory.h" #include "uhash.h" diff --git a/icuSources/common/bytestrieiterator.cpp b/icuSources/common/bytestrieiterator.cpp index eacb7ee..ef9233c 100644 --- a/icuSources/common/bytestrieiterator.cpp +++ b/icuSources/common/bytestrieiterator.cpp @@ -14,9 +14,9 @@ * created by: Markus W. Scherer */ -#include "unicode/utypes.h" -#include "unicode/bytestrie.h" -#include "unicode/stringpiece.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/bytestrie.h> +#include <_foundation_unicode/stringpiece.h> #include "charstr.h" #include "uvectr32.h" diff --git a/icuSources/common/caniter.cpp b/icuSources/common/caniter.cpp index 81f1726..9771b70 100644 --- a/icuSources/common/caniter.cpp +++ b/icuSources/common/caniter.cpp @@ -7,17 +7,17 @@ ***************************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_NORMALIZATION -#include "unicode/caniter.h" -#include "unicode/normalizer2.h" -#include "unicode/uchar.h" -#include "unicode/uniset.h" -#include "unicode/usetiter.h" -#include "unicode/ustring.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/caniter.h> +#include <_foundation_unicode/normalizer2.h> +#include <_foundation_unicode/uchar.h> +#include <_foundation_unicode/uniset.h> +#include <_foundation_unicode/usetiter.h> +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/utf16.h> #include "cmemory.h" #include "hash.h" #include "normalizer2impl.h" diff --git a/icuSources/common/capi_helper.h b/icuSources/common/capi_helper.h index 54b1db9..a41c285 100644 --- a/icuSources/common/capi_helper.h +++ b/icuSources/common/capi_helper.h @@ -4,7 +4,7 @@ #ifndef __CAPI_HELPER_H__ #define __CAPI_HELPER_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> U_NAMESPACE_BEGIN diff --git a/icuSources/common/characterproperties.cpp b/icuSources/common/characterproperties.cpp index 2316a39..99664fd 100644 --- a/icuSources/common/characterproperties.cpp +++ b/icuSources/common/characterproperties.cpp @@ -4,15 +4,15 @@ // characterproperties.cpp // created: 2018sep03 Markus W. Scherer -#include "unicode/utypes.h" -#include "unicode/localpointer.h" -#include "unicode/uchar.h" -#include "unicode/ucpmap.h" -#include "unicode/ucptrie.h" -#include "unicode/umutablecptrie.h" -#include "unicode/uniset.h" -#include "unicode/uscript.h" -#include "unicode/uset.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/localpointer.h> +#include <_foundation_unicode/uchar.h> +#include <_foundation_unicode/ucpmap.h> +#include <_foundation_unicode/ucptrie.h> +#include <_foundation_unicode/umutablecptrie.h> +#include <_foundation_unicode/uniset.h> +#include <_foundation_unicode/uscript.h> +#include <_foundation_unicode/uset.h> #include "cmemory.h" #include "emojiprops.h" #include "mutex.h" diff --git a/icuSources/common/chariter.cpp b/icuSources/common/chariter.cpp index 887119a..fefd8b6 100644 --- a/icuSources/common/chariter.cpp +++ b/icuSources/common/chariter.cpp @@ -7,7 +7,7 @@ ********************************************************************** */ -#include "unicode/chariter.h" +#include <_foundation_unicode/chariter.h> U_NAMESPACE_BEGIN diff --git a/icuSources/common/charstr.cpp b/icuSources/common/charstr.cpp index 8a0994c..5a557fa 100644 --- a/icuSources/common/charstr.cpp +++ b/icuSources/common/charstr.cpp @@ -16,8 +16,8 @@ #include -#include "unicode/utypes.h" -#include "unicode/putil.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/putil.h> #include "charstr.h" #include "cmemory.h" #include "cstring.h" diff --git a/icuSources/common/charstr.h b/icuSources/common/charstr.h index 92a75d3..f704a09 100644 --- a/icuSources/common/charstr.h +++ b/icuSources/common/charstr.h @@ -14,9 +14,9 @@ #ifndef CHARSTRING_H #define CHARSTRING_H -#include "unicode/utypes.h" -#include "unicode/unistr.h" -#include "unicode/uobject.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/uobject.h> #include "cmemory.h" U_NAMESPACE_BEGIN diff --git a/icuSources/common/charstrmap.h b/icuSources/common/charstrmap.h index 3320a46..59cee1c 100644 --- a/icuSources/common/charstrmap.h +++ b/icuSources/common/charstrmap.h @@ -8,8 +8,8 @@ #define __CHARSTRMAP_H__ #include -#include "unicode/utypes.h" -#include "unicode/uobject.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/uobject.h> #include "uhash.h" U_NAMESPACE_BEGIN diff --git a/icuSources/common/cmemory.cpp b/icuSources/common/cmemory.cpp index 64f5034..1162240 100644 --- a/icuSources/common/cmemory.cpp +++ b/icuSources/common/cmemory.cpp @@ -20,7 +20,7 @@ * ****************************************************************************** */ -#include "unicode/uclean.h" +#include <_foundation_unicode/uclean.h> #include "cmemory.h" #include "putilimp.h" #include "uassert.h" diff --git a/icuSources/common/cmemory.h b/icuSources/common/cmemory.h index f03b7dc..952266a 100644 --- a/icuSources/common/cmemory.h +++ b/icuSources/common/cmemory.h @@ -26,11 +26,11 @@ #ifndef CMEMORY_H #define CMEMORY_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #include #include -#include "unicode/localpointer.h" +#include <_foundation_unicode/localpointer.h> #include "uassert.h" #if U_DEBUG && defined(UPRV_MALLOC_COUNT) @@ -172,7 +172,7 @@ uprv_deleteUObject(void *obj); #ifdef __cplusplus #include -#include "unicode/uobject.h" +#include <_foundation_unicode/uobject.h> U_NAMESPACE_BEGIN diff --git a/icuSources/common/cpputils.h b/icuSources/common/cpputils.h index 307e570..11a6ed1 100644 --- a/icuSources/common/cpputils.h +++ b/icuSources/common/cpputils.h @@ -16,8 +16,8 @@ #ifndef CPPUTILS_H #define CPPUTILS_H -#include "unicode/utypes.h" -#include "unicode/unistr.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/unistr.h> #include "cmemory.h" /*==========================================================================*/ diff --git a/icuSources/common/cstr.cpp b/icuSources/common/cstr.cpp index 24654f8..6de8e3e 100644 --- a/icuSources/common/cstr.cpp +++ b/icuSources/common/cstr.cpp @@ -7,9 +7,9 @@ ******************************************************************************* * file name: charstr.cpp */ -#include "unicode/utypes.h" -#include "unicode/putil.h" -#include "unicode/unistr.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/putil.h> +#include <_foundation_unicode/unistr.h> #include "cstr.h" diff --git a/icuSources/common/cstr.h b/icuSources/common/cstr.h index be21d91..0c03a9f 100644 --- a/icuSources/common/cstr.h +++ b/icuSources/common/cstr.h @@ -14,9 +14,9 @@ #ifndef CSTR_H #define CSTR_H -#include "unicode/unistr.h" -#include "unicode/uobject.h" -#include "unicode/utypes.h" +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/uobject.h> +#include <_foundation_unicode/utypes.h> #include "charstr.h" diff --git a/icuSources/common/cstring.cpp b/icuSources/common/cstring.cpp index 06275c4..8428992 100644 --- a/icuSources/common/cstring.cpp +++ b/icuSources/common/cstring.cpp @@ -25,7 +25,7 @@ #include #include -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #include "cmemory.h" #include "cstring.h" #include "uassert.h" diff --git a/icuSources/common/cstring.h b/icuSources/common/cstring.h index 3a14e42..25c27df 100644 --- a/icuSources/common/cstring.h +++ b/icuSources/common/cstring.h @@ -27,7 +27,7 @@ #ifndef CSTRING_H #define CSTRING_H 1 -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #include "cmemory.h" #include #include diff --git a/icuSources/common/cwchar.cpp b/icuSources/common/cwchar.cpp index 20c7d71..09975b4 100644 --- a/icuSources/common/cwchar.cpp +++ b/icuSources/common/cwchar.cpp @@ -16,7 +16,7 @@ * created by: Markus W. Scherer */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !U_HAVE_WCSCPY diff --git a/icuSources/common/cwchar.h b/icuSources/common/cwchar.h index 8fd041a..dce4983 100644 --- a/icuSources/common/cwchar.h +++ b/icuSources/common/cwchar.h @@ -25,7 +25,7 @@ #include #include -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> /* Do this after utypes.h so that we have U_HAVE_WCHAR_H . */ #if U_HAVE_WCHAR_H diff --git a/icuSources/common/dictbe.cpp b/icuSources/common/dictbe.cpp index 768eb49..83427a0 100644 --- a/icuSources/common/dictbe.cpp +++ b/icuSources/common/dictbe.cpp @@ -9,23 +9,23 @@ #include -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_BREAK_ITERATION #include "brkeng.h" #include "dictbe.h" -#include "unicode/uniset.h" -#include "unicode/chariter.h" -#include "unicode/resbund.h" -#include "unicode/ubrk.h" -#include "unicode/usetiter.h" +#include <_foundation_unicode/uniset.h> +#include <_foundation_unicode/chariter.h> +#include <_foundation_unicode/resbund.h> +#include <_foundation_unicode/ubrk.h> +#include <_foundation_unicode/usetiter.h> #include "ubrkimpl.h" #include "utracimp.h" #include "uvectr32.h" #include "uvector.h" #include "uassert.h" -#include "unicode/normlzr.h" +#include <_foundation_unicode/normlzr.h> #include "cmemory.h" #include "dictionarydata.h" diff --git a/icuSources/common/dictbe.h b/icuSources/common/dictbe.h index ca1a3c2..75edf99 100644 --- a/icuSources/common/dictbe.h +++ b/icuSources/common/dictbe.h @@ -10,9 +10,9 @@ #ifndef DICTBE_H #define DICTBE_H -#include "unicode/utypes.h" -#include "unicode/uniset.h" -#include "unicode/utext.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/uniset.h> +#include <_foundation_unicode/utext.h> #include "brkeng.h" #include "hash.h" diff --git a/icuSources/common/dictionarydata.cpp b/icuSources/common/dictionarydata.cpp index 6e2dbee..c13c230 100644 --- a/icuSources/common/dictionarydata.cpp +++ b/icuSources/common/dictionarydata.cpp @@ -12,9 +12,9 @@ */ #include "dictionarydata.h" -#include "unicode/ucharstrie.h" -#include "unicode/bytestrie.h" -#include "unicode/udata.h" +#include <_foundation_unicode/ucharstrie.h> +#include <_foundation_unicode/bytestrie.h> +#include <_foundation_unicode/udata.h> #include "cmemory.h" #if !UCONFIG_NO_BREAK_ITERATION diff --git a/icuSources/common/dictionarydata.h b/icuSources/common/dictionarydata.h index e75716f..c7e2d7f 100644 --- a/icuSources/common/dictionarydata.h +++ b/icuSources/common/dictionarydata.h @@ -14,15 +14,15 @@ #ifndef __DICTIONARYDATA_H__ #define __DICTIONARYDATA_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_BREAK_ITERATION -#include "unicode/utext.h" -#include "unicode/udata.h" +#include <_foundation_unicode/utext.h> +#include <_foundation_unicode/udata.h> #include "udataswp.h" -#include "unicode/uobject.h" -#include "unicode/ustringtrie.h" +#include <_foundation_unicode/uobject.h> +#include <_foundation_unicode/ustringtrie.h> U_NAMESPACE_BEGIN @@ -152,7 +152,7 @@ udict_swap(const UDataSwapper *ds, const void *inData, int32_t length, void *out * transforming Unicode strings into byte sequences. * * A .dict file begins with a standard ICU data file header - * (DataHeader, see ucmndata.h and unicode/udata.h). + * (DataHeader, see ucmndata.h and _foundation_unicode/udata.h). * The UDataInfo.dataVersion field is currently unused (set to 0.0.0.0). * * After the header, the file contains the following parts. diff --git a/icuSources/common/dtintrv.cpp b/icuSources/common/dtintrv.cpp index 011ad81..4f58280 100644 --- a/icuSources/common/dtintrv.cpp +++ b/icuSources/common/dtintrv.cpp @@ -12,7 +12,7 @@ -#include "unicode/dtintrv.h" +#include <_foundation_unicode/dtintrv.h> U_NAMESPACE_BEGIN diff --git a/icuSources/common/edits.cpp b/icuSources/common/edits.cpp index 21d7c3f..d622553 100644 --- a/icuSources/common/edits.cpp +++ b/icuSources/common/edits.cpp @@ -4,9 +4,9 @@ // edits.cpp // created: 2017feb08 Markus W. Scherer -#include "unicode/edits.h" -#include "unicode/unistr.h" -#include "unicode/utypes.h" +#include <_foundation_unicode/edits.h> +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/utypes.h> #include "cmemory.h" #include "uassert.h" #include "util.h" diff --git a/icuSources/common/emojiprops.cpp b/icuSources/common/emojiprops.cpp index d07e07c..6cd10f0 100644 --- a/icuSources/common/emojiprops.cpp +++ b/icuSources/common/emojiprops.cpp @@ -4,13 +4,13 @@ // emojiprops.cpp // created: 2021sep04 Markus W. Scherer -#include "unicode/utypes.h" -#include "unicode/uchar.h" -#include "unicode/ucharstrie.h" -#include "unicode/ucptrie.h" -#include "unicode/udata.h" -#include "unicode/ustringtrie.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/uchar.h> +#include <_foundation_unicode/ucharstrie.h> +#include <_foundation_unicode/ucptrie.h> +#include <_foundation_unicode/udata.h> +#include <_foundation_unicode/ustringtrie.h> +#include <_foundation_unicode/utf16.h> #include "emojiprops.h" #include "ucln.h" #include "ucln_cmn.h" diff --git a/icuSources/common/emojiprops.h b/icuSources/common/emojiprops.h index 457847c..db2aeea 100644 --- a/icuSources/common/emojiprops.h +++ b/icuSources/common/emojiprops.h @@ -7,10 +7,10 @@ #ifndef __EMOJIPROPS_H__ #define __EMOJIPROPS_H__ -#include "unicode/utypes.h" -#include "unicode/ucptrie.h" -#include "unicode/udata.h" -#include "unicode/uobject.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/ucptrie.h> +#include <_foundation_unicode/udata.h> +#include <_foundation_unicode/uobject.h> #include "uset_imp.h" U_NAMESPACE_BEGIN diff --git a/icuSources/common/errorcode.cpp b/icuSources/common/errorcode.cpp index e7ac43b..5aee672 100644 --- a/icuSources/common/errorcode.cpp +++ b/icuSources/common/errorcode.cpp @@ -16,8 +16,8 @@ * created by: Markus W. Scherer */ -#include "unicode/utypes.h" -#include "unicode/errorcode.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/errorcode.h> U_NAMESPACE_BEGIN diff --git a/icuSources/common/filteredbrk.cpp b/icuSources/common/filteredbrk.cpp index 741aec0..d920c6e 100644 --- a/icuSources/common/filteredbrk.cpp +++ b/icuSources/common/filteredbrk.cpp @@ -7,14 +7,14 @@ ******************************************************************************* */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_BREAK_ITERATION && !UCONFIG_NO_FILTERED_BREAK_ITERATION #include "cmemory.h" -#include "unicode/filteredbrk.h" -#include "unicode/ucharstriebuilder.h" -#include "unicode/ures.h" +#include <_foundation_unicode/filteredbrk.h> +#include <_foundation_unicode/ucharstriebuilder.h> +#include <_foundation_unicode/ures.h> #include "uresimp.h" // ures_getByKeyWithFallback #include "ubrkimpl.h" // U_ICUDATA_BRKITR diff --git a/icuSources/common/filterednormalizer2.cpp b/icuSources/common/filterednormalizer2.cpp index 63f0120..84ecfda 100644 --- a/icuSources/common/filterednormalizer2.cpp +++ b/icuSources/common/filterednormalizer2.cpp @@ -16,16 +16,16 @@ * created by: Markus W. Scherer */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_NORMALIZATION -#include "unicode/edits.h" -#include "unicode/normalizer2.h" -#include "unicode/stringoptions.h" -#include "unicode/uniset.h" -#include "unicode/unistr.h" -#include "unicode/unorm.h" +#include <_foundation_unicode/edits.h> +#include <_foundation_unicode/normalizer2.h> +#include <_foundation_unicode/stringoptions.h> +#include <_foundation_unicode/uniset.h> +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/unorm.h> #include "cpputils.h" U_NAMESPACE_BEGIN diff --git a/icuSources/common/hash.h b/icuSources/common/hash.h index c9afeaf..23fa946 100644 --- a/icuSources/common/hash.h +++ b/icuSources/common/hash.h @@ -13,8 +13,8 @@ #ifndef HASH_H #define HASH_H -#include "unicode/unistr.h" -#include "unicode/uobject.h" +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/uobject.h> #include "cmemory.h" #include "uhash.h" diff --git a/icuSources/common/icu_packaged_data.cpp b/icuSources/common/icu_packaged_data.cpp new file mode 100644 index 0000000..be83a0b --- /dev/null +++ b/icuSources/common/icu_packaged_data.cpp @@ -0,0 +1,30 @@ +//===----------------------------------------------------------------------===// +// +// This source file is part of the Swift.org open source project +// +// Copyright (c) 2023 Apple Inc. and the Swift project authors +// Licensed under Apache License v2.0 with Runtime Library Exception +// +// See https://swift.org/LICENSE.txt for license information +// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors +// +//===----------------------------------------------------------------------===// + +#if USE_PACKAGE_DATA + +#include "icu_packaged_main_data.0.inc.h" +#include "icu_packaged_main_data.1.inc.h" +#include "icu_packaged_main_data.2.inc.h" +#include "icu_packaged_main_data.3.inc.h" + +#include +#include <_foundation_unicode/utypes.h> + +extern "C" U_EXPORT uint8_t const U_ICUDATA_ENTRY_POINT[] __attribute__ ((aligned (8))) = { + __ICU_PACKAGED_MAIN_DATA_CHUNK_0, + __ICU_PACKAGED_MAIN_DATA_CHUNK_1, + __ICU_PACKAGED_MAIN_DATA_CHUNK_2, + __ICU_PACKAGED_MAIN_DATA_CHUNK_3, +}; + +#endif diff --git a/icuSources/common/icu_packaged_data.h b/icuSources/common/icu_packaged_data.h index 3d40789..daa793c 100644 --- a/icuSources/common/icu_packaged_data.h +++ b/icuSources/common/icu_packaged_data.h @@ -13,23 +13,11 @@ #ifndef ICU_PACKAGED_DATA_H #define ICU_PACKAGED_DATA_H -#include "icu_packaged_main_data.0.inc.h" -#include "icu_packaged_main_data.1.inc.h" -#include "icu_packaged_main_data.2.inc.h" -#include "icu_packaged_main_data.3.inc.h" - #include "icu_packaged_timezone_data.0.inc.h" #include "icu_packaged_timezone_data.1.inc.h" #include "icu_packaged_timezone_data.2.inc.h" #include "icu_packaged_timezone_data.3.inc.h" -uint8_t const _ICUPackagedMainData[] __attribute__ ((aligned (8))) = { - __ICU_PACKAGED_MAIN_DATA_CHUNK_0, - __ICU_PACKAGED_MAIN_DATA_CHUNK_1, - __ICU_PACKAGED_MAIN_DATA_CHUNK_2, - __ICU_PACKAGED_MAIN_DATA_CHUNK_3, -}; - uint8_t const _ICUPackagedTimeZoneData[] __attribute__ ((aligned (8))) = { __ICU_PACKAGED_TIMEZONE_DATA_CHUNK_0, __ICU_PACKAGED_TIMEZONE_DATA_CHUNK_1, diff --git a/icuSources/common/icudataver.cpp b/icuSources/common/icudataver.cpp index d314411..71471dd 100644 --- a/icuSources/common/icudataver.cpp +++ b/icuSources/common/icudataver.cpp @@ -9,9 +9,9 @@ ****************************************************************************** */ -#include "unicode/utypes.h" -#include "unicode/icudataver.h" -#include "unicode/ures.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/icudataver.h> +#include <_foundation_unicode/ures.h> #include "uresimp.h" /* for ures_getVersionByKey */ U_CAPI void U_EXPORT2 u_getDataVersion(UVersionInfo dataVersionFillin, UErrorCode *status) { diff --git a/icuSources/common/icuplug.cpp b/icuSources/common/icuplug.cpp index 72b5d27..0d4e920 100644 --- a/icuSources/common/icuplug.cpp +++ b/icuSources/common/icuplug.cpp @@ -15,7 +15,7 @@ ****************************************************************************** */ -#include "unicode/icuplug.h" +#include <_foundation_unicode/icuplug.h> #if UCONFIG_ENABLE_PLUGINS diff --git a/icuSources/common/icuplugimp.h b/icuSources/common/icuplugimp.h index 9df3092..b4796f5 100644 --- a/icuSources/common/icuplugimp.h +++ b/icuSources/common/icuplugimp.h @@ -21,7 +21,7 @@ #ifndef ICUPLUGIMP_H #define ICUPLUGIMP_H -#include "unicode/icuplug.h" +#include <_foundation_unicode/icuplug.h> #if UCONFIG_ENABLE_PLUGINS diff --git a/icuSources/common/loadednormalizer2impl.cpp b/icuSources/common/loadednormalizer2impl.cpp index 24ff629..8bccf0b 100644 --- a/icuSources/common/loadednormalizer2impl.cpp +++ b/icuSources/common/loadednormalizer2impl.cpp @@ -11,16 +11,16 @@ * created by: Markus W. Scherer */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_NORMALIZATION -#include "unicode/udata.h" -#include "unicode/localpointer.h" -#include "unicode/normalizer2.h" -#include "unicode/ucptrie.h" -#include "unicode/unistr.h" -#include "unicode/unorm.h" +#include <_foundation_unicode/udata.h> +#include <_foundation_unicode/localpointer.h> +#include <_foundation_unicode/normalizer2.h> +#include <_foundation_unicode/ucptrie.h> +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/unorm.h> #include "cstring.h" #include "mutex.h" #include "norm2allmodes.h" diff --git a/icuSources/common/localebuilder.cpp b/icuSources/common/localebuilder.cpp index c1e1f2a..0cde962 100644 --- a/icuSources/common/localebuilder.cpp +++ b/icuSources/common/localebuilder.cpp @@ -7,8 +7,8 @@ #include "charstr.h" #include "cstring.h" #include "ulocimp.h" -#include "unicode/localebuilder.h" -#include "unicode/locid.h" +#include <_foundation_unicode/localebuilder.h> +#include <_foundation_unicode/locid.h> U_NAMESPACE_BEGIN diff --git a/icuSources/common/localematcher.cpp b/icuSources/common/localematcher.cpp index 2f8664b..d5c34a3 100644 --- a/icuSources/common/localematcher.cpp +++ b/icuSources/common/localematcher.cpp @@ -4,13 +4,13 @@ // localematcher.cpp // created: 2019may08 Markus W. Scherer -#include "unicode/utypes.h" -#include "unicode/localebuilder.h" -#include "unicode/localematcher.h" -#include "unicode/locid.h" -#include "unicode/stringpiece.h" -#include "unicode/uloc.h" -#include "unicode/uobject.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/localebuilder.h> +#include <_foundation_unicode/localematcher.h> +#include <_foundation_unicode/locid.h> +#include <_foundation_unicode/stringpiece.h> +#include <_foundation_unicode/uloc.h> +#include <_foundation_unicode/uobject.h> #include "cstring.h" #include "localeprioritylist.h" #include "loclikelysubtags.h" diff --git a/icuSources/common/localeprioritylist.cpp b/icuSources/common/localeprioritylist.cpp index e5ba0a3..f4cd0f8 100644 --- a/icuSources/common/localeprioritylist.cpp +++ b/icuSources/common/localeprioritylist.cpp @@ -4,11 +4,11 @@ // localeprioritylist.cpp // created: 2019jul11 Markus W. Scherer -#include "unicode/utypes.h" -#include "unicode/localpointer.h" -#include "unicode/locid.h" -#include "unicode/stringpiece.h" -#include "unicode/uobject.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/localpointer.h> +#include <_foundation_unicode/locid.h> +#include <_foundation_unicode/stringpiece.h> +#include <_foundation_unicode/uobject.h> #include "charstr.h" #include "cmemory.h" #include "localeprioritylist.h" diff --git a/icuSources/common/localeprioritylist.h b/icuSources/common/localeprioritylist.h index 41e9d3e..b19fb9b 100644 --- a/icuSources/common/localeprioritylist.h +++ b/icuSources/common/localeprioritylist.h @@ -7,10 +7,10 @@ #ifndef __LOCALEPRIORITYLIST_H__ #define __LOCALEPRIORITYLIST_H__ -#include "unicode/utypes.h" -#include "unicode/locid.h" -#include "unicode/stringpiece.h" -#include "unicode/uobject.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/locid.h> +#include <_foundation_unicode/stringpiece.h> +#include <_foundation_unicode/uobject.h> struct UHashtable; diff --git a/icuSources/common/localsvc.cpp b/icuSources/common/localsvc.cpp index bc0844d..6576c02 100644 --- a/icuSources/common/localsvc.cpp +++ b/icuSources/common/localsvc.cpp @@ -5,7 +5,7 @@ // originally added per rdar://4448220 Add user dictionary support // -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_BREAK_ITERATION diff --git a/icuSources/common/localsvc.h b/icuSources/common/localsvc.h index 3364019..8c04b9c 100644 --- a/icuSources/common/localsvc.h +++ b/icuSources/common/localsvc.h @@ -10,7 +10,7 @@ #ifndef LOCALSVC_H #define LOCALSVC_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if defined(U_LOCAL_SERVICE_HOOK) && U_LOCAL_SERVICE_HOOK /** diff --git a/icuSources/common/locavailable.cpp b/icuSources/common/locavailable.cpp index cf341e1..65dd5fd 100644 --- a/icuSources/common/locavailable.cpp +++ b/icuSources/common/locavailable.cpp @@ -19,11 +19,11 @@ * that then do not depend on resource bundle code and res_index bundles. */ -#include "unicode/errorcode.h" -#include "unicode/utypes.h" -#include "unicode/locid.h" -#include "unicode/uloc.h" -#include "unicode/ures.h" +#include <_foundation_unicode/errorcode.h> +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/locid.h> +#include <_foundation_unicode/uloc.h> +#include <_foundation_unicode/ures.h> #include "cmemory.h" #include "cstring.h" #include "ucln_cmn.h" diff --git a/icuSources/common/locbased.h b/icuSources/common/locbased.h index 4573886..93fac36 100644 --- a/icuSources/common/locbased.h +++ b/icuSources/common/locbased.h @@ -13,8 +13,8 @@ #ifndef LOCBASED_H #define LOCBASED_H -#include "unicode/locid.h" -#include "unicode/uobject.h" +#include <_foundation_unicode/locid.h> +#include <_foundation_unicode/uobject.h> /** * Macro to declare a locale LocaleBased wrapper object for the given diff --git a/icuSources/common/locdispnames.cpp b/icuSources/common/locdispnames.cpp index 1b37e9b..fa7582f 100644 --- a/icuSources/common/locdispnames.cpp +++ b/icuSources/common/locdispnames.cpp @@ -19,16 +19,16 @@ * that then do not depend on resource bundle code and display name data. */ -#include "unicode/utypes.h" -#include "unicode/brkiter.h" -#include "unicode/locid.h" -#include "unicode/uenum.h" -#include "unicode/uloc.h" -#include "unicode/ures.h" -#include "unicode/ustring.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/brkiter.h> +#include <_foundation_unicode/locid.h> +#include <_foundation_unicode/uenum.h> +#include <_foundation_unicode/uloc.h> +#include <_foundation_unicode/ures.h> +#include <_foundation_unicode/ustring.h> #if APPLE_ICU_CHANGES // rdar://51418203 finish support for pa_Aran; have uloc_getDisplayName call uldn function for special names -#include "unicode/uldnames.h" +#include <_foundation_unicode/uldnames.h> #endif // APPLE_ICU_CHANGES #include "bytesinkutil.h" #include "charstr.h" diff --git a/icuSources/common/locdistance.cpp b/icuSources/common/locdistance.cpp index fb22fe7..8559383 100644 --- a/icuSources/common/locdistance.cpp +++ b/icuSources/common/locdistance.cpp @@ -4,12 +4,12 @@ // locdistance.cpp // created: 2019may08 Markus W. Scherer -#include "unicode/utypes.h" -#include "unicode/bytestrie.h" -#include "unicode/localematcher.h" -#include "unicode/locid.h" -#include "unicode/uobject.h" -#include "unicode/ures.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/bytestrie.h> +#include <_foundation_unicode/localematcher.h> +#include <_foundation_unicode/locid.h> +#include <_foundation_unicode/uobject.h> +#include <_foundation_unicode/ures.h> #include "cstring.h" #include "locdistance.h" #include "loclikelysubtags.h" diff --git a/icuSources/common/locdistance.h b/icuSources/common/locdistance.h index 51b777e..3843526 100644 --- a/icuSources/common/locdistance.h +++ b/icuSources/common/locdistance.h @@ -7,11 +7,11 @@ #ifndef __LOCDISTANCE_H__ #define __LOCDISTANCE_H__ -#include "unicode/utypes.h" -#include "unicode/bytestrie.h" -#include "unicode/localematcher.h" -#include "unicode/locid.h" -#include "unicode/uobject.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/bytestrie.h> +#include <_foundation_unicode/localematcher.h> +#include <_foundation_unicode/locid.h> +#include <_foundation_unicode/uobject.h> #include "lsr.h" U_NAMESPACE_BEGIN diff --git a/icuSources/common/locdspnm.cpp b/icuSources/common/locdspnm.cpp index f1a23cf..a2e7c4f 100644 --- a/icuSources/common/locdspnm.cpp +++ b/icuSources/common/locdspnm.cpp @@ -7,17 +7,17 @@ ******************************************************************************* */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/locdspnm.h" -#include "unicode/simpleformatter.h" -#include "unicode/ucasemap.h" -#include "unicode/ures.h" -#include "unicode/udisplaycontext.h" -#include "unicode/brkiter.h" -#include "unicode/ucurr.h" +#include <_foundation_unicode/locdspnm.h> +#include <_foundation_unicode/simpleformatter.h> +#include <_foundation_unicode/ucasemap.h> +#include <_foundation_unicode/ures.h> +#include <_foundation_unicode/udisplaycontext.h> +#include <_foundation_unicode/brkiter.h> +#include <_foundation_unicode/ucurr.h> #include "cmemory.h" #include "cstring.h" #include "mutex.h" diff --git a/icuSources/common/locid.cpp b/icuSources/common/locid.cpp index 5cd0838..1052432 100644 --- a/icuSources/common/locid.cpp +++ b/icuSources/common/locid.cpp @@ -33,13 +33,13 @@ #include -#include "unicode/bytestream.h" -#include "unicode/locid.h" -#include "unicode/localebuilder.h" -#include "unicode/strenum.h" -#include "unicode/stringpiece.h" -#include "unicode/uloc.h" -#include "unicode/ures.h" +#include <_foundation_unicode/bytestream.h> +#include <_foundation_unicode/locid.h> +#include <_foundation_unicode/localebuilder.h> +#include <_foundation_unicode/strenum.h> +#include <_foundation_unicode/stringpiece.h> +#include <_foundation_unicode/uloc.h> +#include <_foundation_unicode/ures.h> #include "bytesinkutil.h" #include "charstr.h" diff --git a/icuSources/common/loclikely.cpp b/icuSources/common/loclikely.cpp index 247cee5..cac9e92 100644 --- a/icuSources/common/loclikely.cpp +++ b/icuSources/common/loclikely.cpp @@ -19,15 +19,15 @@ * that then do not depend on resource bundle code and likely-subtags data. */ -#include "unicode/bytestream.h" -#include "unicode/utypes.h" -#include "unicode/localebuilder.h" -#include "unicode/locid.h" -#include "unicode/putil.h" -#include "unicode/uchar.h" -#include "unicode/uloc.h" -#include "unicode/ures.h" -#include "unicode/uscript.h" +#include <_foundation_unicode/bytestream.h> +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/localebuilder.h> +#include <_foundation_unicode/locid.h> +#include <_foundation_unicode/putil.h> +#include <_foundation_unicode/uchar.h> +#include <_foundation_unicode/uloc.h> +#include <_foundation_unicode/ures.h> +#include <_foundation_unicode/uscript.h> #include "bytesinkutil.h" #include "charstr.h" #include "cmemory.h" diff --git a/icuSources/common/loclikelysubtags.cpp b/icuSources/common/loclikelysubtags.cpp index 11fe5ce..2fbe4e0 100644 --- a/icuSources/common/loclikelysubtags.cpp +++ b/icuSources/common/loclikelysubtags.cpp @@ -5,12 +5,12 @@ // created: 2019may08 Markus W. Scherer #include -#include "unicode/utypes.h" -#include "unicode/bytestrie.h" -#include "unicode/localpointer.h" -#include "unicode/locid.h" -#include "unicode/uobject.h" -#include "unicode/ures.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/bytestrie.h> +#include <_foundation_unicode/localpointer.h> +#include <_foundation_unicode/locid.h> +#include <_foundation_unicode/uobject.h> +#include <_foundation_unicode/ures.h> #include "charstr.h" #include "cstring.h" #include "loclikelysubtags.h" diff --git a/icuSources/common/loclikelysubtags.h b/icuSources/common/loclikelysubtags.h index 14a01a5..8fe0df7 100644 --- a/icuSources/common/loclikelysubtags.h +++ b/icuSources/common/loclikelysubtags.h @@ -8,11 +8,11 @@ #define __LOCLIKELYSUBTAGS_H__ #include -#include "unicode/utypes.h" -#include "unicode/bytestrie.h" -#include "unicode/locid.h" -#include "unicode/uobject.h" -#include "unicode/ures.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/bytestrie.h> +#include <_foundation_unicode/locid.h> +#include <_foundation_unicode/uobject.h> +#include <_foundation_unicode/ures.h> #include "charstrmap.h" #include "lsr.h" diff --git a/icuSources/common/locmap.cpp b/icuSources/common/locmap.cpp index 78cfd1c..5bc6aea 100644 --- a/icuSources/common/locmap.cpp +++ b/icuSources/common/locmap.cpp @@ -33,7 +33,7 @@ #include "cstring.h" #include "cmemory.h" #include "ulocimp.h" -#include "unicode/uloc.h" +#include <_foundation_unicode/uloc.h> #if U_PLATFORM_HAS_WIN32_API && UCONFIG_USE_WINDOWS_LCID_MAPPING_API #include diff --git a/icuSources/common/locmap.h b/icuSources/common/locmap.h index e669873..3f0b796 100644 --- a/icuSources/common/locmap.h +++ b/icuSources/common/locmap.h @@ -26,7 +26,7 @@ #ifndef LOCMAP_H #define LOCMAP_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #define LANGUAGE_LCID(hostID) (uint16_t)(0x03FF & hostID) diff --git a/icuSources/common/locresdata.cpp b/icuSources/common/locresdata.cpp index d1d9a47..97132ba 100644 --- a/icuSources/common/locresdata.cpp +++ b/icuSources/common/locresdata.cpp @@ -20,10 +20,10 @@ * that then do not depend on resource bundle code and this data. */ -#include "unicode/utypes.h" -#include "unicode/putil.h" -#include "unicode/uloc.h" -#include "unicode/ures.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/putil.h> +#include <_foundation_unicode/uloc.h> +#include <_foundation_unicode/ures.h> #include "cstring.h" #include "ulocimp.h" #include "uresimp.h" diff --git a/icuSources/common/locutil.cpp b/icuSources/common/locutil.cpp index 6e2bd49..8d63669 100644 --- a/icuSources/common/locutil.cpp +++ b/icuSources/common/locutil.cpp @@ -6,12 +6,12 @@ * others. All Rights Reserved. ******************************************************************************* */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_SERVICE || !UCONFIG_NO_TRANSLITERATION -#include "unicode/resbund.h" -#include "unicode/uenum.h" +#include <_foundation_unicode/resbund.h> +#include <_foundation_unicode/uenum.h> #include "cmemory.h" #include "ustrfmt.h" #include "locutil.h" diff --git a/icuSources/common/locutil.h b/icuSources/common/locutil.h index 31bfffd..d6b9236 100644 --- a/icuSources/common/locutil.h +++ b/icuSources/common/locutil.h @@ -11,7 +11,7 @@ #ifndef LOCUTIL_H #define LOCUTIL_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #include "hash.h" #if !UCONFIG_NO_SERVICE || !UCONFIG_NO_TRANSLITERATION diff --git a/icuSources/common/lsr.cpp b/icuSources/common/lsr.cpp index 1f0b69a..dcca440 100644 --- a/icuSources/common/lsr.cpp +++ b/icuSources/common/lsr.cpp @@ -4,7 +4,7 @@ // lsr.cpp // created: 2019may08 Markus W. Scherer -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #include "charstr.h" #include "cmemory.h" #include "cstring.h" diff --git a/icuSources/common/lsr.h b/icuSources/common/lsr.h index af993c1..92d9fb0 100644 --- a/icuSources/common/lsr.h +++ b/icuSources/common/lsr.h @@ -7,8 +7,8 @@ #ifndef __LSR_H__ #define __LSR_H__ -#include "unicode/utypes.h" -#include "unicode/uobject.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/uobject.h> #include "cstring.h" U_NAMESPACE_BEGIN diff --git a/icuSources/common/lstmbe.cpp b/icuSources/common/lstmbe.cpp index f6114cd..d2debce 100644 --- a/icuSources/common/lstmbe.cpp +++ b/icuSources/common/lstmbe.cpp @@ -4,7 +4,7 @@ #include #include -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_BREAK_ITERATION @@ -19,12 +19,12 @@ #include "uvectr32.h" #include "uvector.h" -#include "unicode/brkiter.h" -#include "unicode/resbund.h" -#include "unicode/ubrk.h" -#include "unicode/uniset.h" -#include "unicode/ustring.h" -#include "unicode/utf.h" +#include <_foundation_unicode/brkiter.h> +#include <_foundation_unicode/resbund.h> +#include <_foundation_unicode/ubrk.h> +#include <_foundation_unicode/uniset.h> +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/utf.h> U_NAMESPACE_BEGIN diff --git a/icuSources/common/lstmbe.h b/icuSources/common/lstmbe.h index ffdf805..f552831 100644 --- a/icuSources/common/lstmbe.h +++ b/icuSources/common/lstmbe.h @@ -4,14 +4,14 @@ #ifndef LSTMBE_H #define LSTMBE_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_BREAK_ITERATION -#include "unicode/uniset.h" -#include "unicode/ures.h" -#include "unicode/utext.h" -#include "unicode/utypes.h" +#include <_foundation_unicode/uniset.h> +#include <_foundation_unicode/ures.h> +#include <_foundation_unicode/utext.h> +#include <_foundation_unicode/utypes.h> #include "brkeng.h" #include "dictbe.h" diff --git a/icuSources/common/messageimpl.h b/icuSources/common/messageimpl.h index 061df91..09116e3 100644 --- a/icuSources/common/messageimpl.h +++ b/icuSources/common/messageimpl.h @@ -17,11 +17,11 @@ #ifndef __MESSAGEIMPL_H__ #define __MESSAGEIMPL_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/messagepattern.h" +#include <_foundation_unicode/messagepattern.h> U_NAMESPACE_BEGIN diff --git a/icuSources/common/messagepattern.cpp b/icuSources/common/messagepattern.cpp index 52afab5..3926fae 100644 --- a/icuSources/common/messagepattern.cpp +++ b/icuSources/common/messagepattern.cpp @@ -14,13 +14,13 @@ * created by: Markus W. Scherer */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/messagepattern.h" -#include "unicode/unistr.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/messagepattern.h> +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/utf16.h> #include "cmemory.h" #include "cstring.h" #include "messageimpl.h" diff --git a/icuSources/common/msvcres.h b/icuSources/common/msvcres.h index d71b5ac..86865f1 100644 --- a/icuSources/common/msvcres.h +++ b/icuSources/common/msvcres.h @@ -11,13 +11,13 @@ // /* -These are defined before unicode/uversion.h in order to prevent +These are defined before _foundation_unicode/uversion.h in order to prevent STLPort's broken stddef.h from being used when rc.exe parses this file. */ #define _STLP_OUTERMOST_HEADER_ID 0 #define _STLP_WINCE 1 -#include "unicode/uversion.h" +#include <_foundation_unicode/uversion.h> #define ICU_WEBSITE "https://icu.unicode.org/" #define ICU_COMPANY "The ICU Project" diff --git a/icuSources/common/mutex.h b/icuSources/common/mutex.h index 44b1f90..6802f12 100644 --- a/icuSources/common/mutex.h +++ b/icuSources/common/mutex.h @@ -22,8 +22,8 @@ #ifndef MUTEX_H #define MUTEX_H -#include "unicode/utypes.h" -#include "unicode/uobject.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/uobject.h> #include "umutex.h" U_NAMESPACE_BEGIN diff --git a/icuSources/common/norm2allmodes.h b/icuSources/common/norm2allmodes.h index 584835d..e1e388b 100644 --- a/icuSources/common/norm2allmodes.h +++ b/icuSources/common/norm2allmodes.h @@ -14,14 +14,14 @@ #ifndef __NORM2ALLMODES_H__ #define __NORM2ALLMODES_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_NORMALIZATION -#include "unicode/edits.h" -#include "unicode/normalizer2.h" -#include "unicode/stringoptions.h" -#include "unicode/unistr.h" +#include <_foundation_unicode/edits.h> +#include <_foundation_unicode/normalizer2.h> +#include <_foundation_unicode/stringoptions.h> +#include <_foundation_unicode/unistr.h> #include "cpputils.h" #include "normalizer2impl.h" diff --git a/icuSources/common/normalizer2.cpp b/icuSources/common/normalizer2.cpp index 3617264..8f3ec85 100644 --- a/icuSources/common/normalizer2.cpp +++ b/icuSources/common/normalizer2.cpp @@ -16,15 +16,15 @@ * created by: Markus W. Scherer */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_NORMALIZATION -#include "unicode/edits.h" -#include "unicode/normalizer2.h" -#include "unicode/stringoptions.h" -#include "unicode/unistr.h" -#include "unicode/unorm.h" +#include <_foundation_unicode/edits.h> +#include <_foundation_unicode/normalizer2.h> +#include <_foundation_unicode/stringoptions.h> +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/unorm.h> #include "cstring.h" #include "mutex.h" #include "norm2allmodes.h" diff --git a/icuSources/common/normalizer2impl.cpp b/icuSources/common/normalizer2impl.cpp index d7e05e4..d4de34d 100644 --- a/icuSources/common/normalizer2impl.cpp +++ b/icuSources/common/normalizer2impl.cpp @@ -18,20 +18,20 @@ // #define UCPTRIE_DEBUG -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_NORMALIZATION -#include "unicode/bytestream.h" -#include "unicode/edits.h" -#include "unicode/normalizer2.h" -#include "unicode/stringoptions.h" -#include "unicode/ucptrie.h" -#include "unicode/udata.h" -#include "unicode/umutablecptrie.h" -#include "unicode/ustring.h" -#include "unicode/utf16.h" -#include "unicode/utf8.h" +#include <_foundation_unicode/bytestream.h> +#include <_foundation_unicode/edits.h> +#include <_foundation_unicode/normalizer2.h> +#include <_foundation_unicode/stringoptions.h> +#include <_foundation_unicode/ucptrie.h> +#include <_foundation_unicode/udata.h> +#include <_foundation_unicode/umutablecptrie.h> +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/utf16.h> +#include <_foundation_unicode/utf8.h> #include "bytesinkutil.h" #include "cmemory.h" #include "mutex.h" diff --git a/icuSources/common/normalizer2impl.h b/icuSources/common/normalizer2impl.h index 449e778..f64abd8 100644 --- a/icuSources/common/normalizer2impl.h +++ b/icuSources/common/normalizer2impl.h @@ -19,16 +19,16 @@ #ifndef __NORMALIZER2IMPL_H__ #define __NORMALIZER2IMPL_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_NORMALIZATION -#include "unicode/normalizer2.h" -#include "unicode/ucptrie.h" -#include "unicode/unistr.h" -#include "unicode/unorm.h" -#include "unicode/utf.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/normalizer2.h> +#include <_foundation_unicode/ucptrie.h> +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/unorm.h> +#include <_foundation_unicode/utf.h> +#include <_foundation_unicode/utf16.h> #include "mutex.h" #include "udataswp.h" #include "uset_imp.h" @@ -798,7 +798,7 @@ unorm_getFCD16(UChar32 c); * cached already. Internally, Normalizer2Impl.load() reads the .nrm file. * * A .nrm file begins with a standard ICU data file header - * (DataHeader, see ucmndata.h and unicode/udata.h). + * (DataHeader, see ucmndata.h and _foundation_unicode/udata.h). * The UDataInfo.dataVersion field usually contains the Unicode version * for which the data was generated. * diff --git a/icuSources/common/normlzr.cpp b/icuSources/common/normlzr.cpp index 58de615..543a383 100644 --- a/icuSources/common/normlzr.cpp +++ b/icuSources/common/normlzr.cpp @@ -8,17 +8,17 @@ ************************************************************************* */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_NORMALIZATION -#include "unicode/uniset.h" -#include "unicode/unistr.h" -#include "unicode/chariter.h" -#include "unicode/schriter.h" -#include "unicode/uchriter.h" -#include "unicode/normlzr.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/uniset.h> +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/chariter.h> +#include <_foundation_unicode/schriter.h> +#include <_foundation_unicode/uchriter.h> +#include <_foundation_unicode/normlzr.h> +#include <_foundation_unicode/utf16.h> #include "cmemory.h" #include "normalizer2impl.h" #include "uprops.h" // for uniset_getUnicode32Instance() diff --git a/icuSources/common/parsepos.cpp b/icuSources/common/parsepos.cpp index 56c6c78..4d0062a 100644 --- a/icuSources/common/parsepos.cpp +++ b/icuSources/common/parsepos.cpp @@ -7,7 +7,7 @@ ********************************************************************** */ -#include "unicode/parsepos.h" +#include <_foundation_unicode/parsepos.h> U_NAMESPACE_BEGIN diff --git a/icuSources/common/patternprops.cpp b/icuSources/common/patternprops.cpp index da3243d..7d4815c 100644 --- a/icuSources/common/patternprops.cpp +++ b/icuSources/common/patternprops.cpp @@ -14,7 +14,7 @@ * created by: Markus W. Scherer */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #include "patternprops.h" U_NAMESPACE_BEGIN diff --git a/icuSources/common/patternprops.h b/icuSources/common/patternprops.h index 4ead56e..826a3aa 100644 --- a/icuSources/common/patternprops.h +++ b/icuSources/common/patternprops.h @@ -17,8 +17,8 @@ #ifndef __PATTERNPROPS_H__ #define __PATTERNPROPS_H__ -#include "unicode/unistr.h" -#include "unicode/utypes.h" +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/utypes.h> U_NAMESPACE_BEGIN diff --git a/icuSources/common/pluralmap.cpp b/icuSources/common/pluralmap.cpp index ec87f01..dd96e18 100644 --- a/icuSources/common/pluralmap.cpp +++ b/icuSources/common/pluralmap.cpp @@ -5,7 +5,7 @@ * others. All Rights Reserved. */ -#include "unicode/unistr.h" +#include <_foundation_unicode/unistr.h> #include "charstr.h" #include "cstring.h" #include "pluralmap.h" diff --git a/icuSources/common/pluralmap.h b/icuSources/common/pluralmap.h index 4988fd2..ae81973 100644 --- a/icuSources/common/pluralmap.h +++ b/icuSources/common/pluralmap.h @@ -13,7 +13,7 @@ #ifndef __PLURAL_MAP_H__ #define __PLURAL_MAP_H__ -#include "unicode/uobject.h" +#include <_foundation_unicode/uobject.h> #include "cmemory.h" U_NAMESPACE_BEGIN diff --git a/icuSources/common/propname.cpp b/icuSources/common/propname.cpp index 8f0045f..14b3498 100644 --- a/icuSources/common/propname.cpp +++ b/icuSources/common/propname.cpp @@ -12,9 +12,9 @@ ********************************************************************** */ #include "propname.h" -#include "unicode/uchar.h" -#include "unicode/udata.h" -#include "unicode/uscript.h" +#include <_foundation_unicode/uchar.h> +#include <_foundation_unicode/udata.h> +#include <_foundation_unicode/uscript.h> #include "umutex.h" #include "cmemory.h" #include "cstring.h" diff --git a/icuSources/common/propname.h b/icuSources/common/propname.h index 1a8ced5..99aecf6 100644 --- a/icuSources/common/propname.h +++ b/icuSources/common/propname.h @@ -14,9 +14,9 @@ #ifndef PROPNAME_H #define PROPNAME_H -#include "unicode/utypes.h" -#include "unicode/bytestrie.h" -#include "unicode/uchar.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/bytestrie.h> +#include <_foundation_unicode/uchar.h> #include "udataswp.h" #include "uprops.h" diff --git a/icuSources/common/propsvec.cpp b/icuSources/common/propsvec.cpp index e5caa4b..335b9a0 100644 --- a/icuSources/common/propsvec.cpp +++ b/icuSources/common/propsvec.cpp @@ -19,7 +19,7 @@ */ #include -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #include "cmemory.h" #include "utrie.h" #include "utrie2.h" diff --git a/icuSources/common/propsvec.h b/icuSources/common/propsvec.h index 3908061..906bb35 100644 --- a/icuSources/common/propsvec.h +++ b/icuSources/common/propsvec.h @@ -21,7 +21,7 @@ #ifndef __UPROPSVEC_H__ #define __UPROPSVEC_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #include "utrie.h" #include "utrie2.h" diff --git a/icuSources/common/punycode.cpp b/icuSources/common/punycode.cpp index f95722d..8eb9bc0 100644 --- a/icuSources/common/punycode.cpp +++ b/icuSources/common/punycode.cpp @@ -44,13 +44,13 @@ Disclaimer and license * - UTF-16 handling */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_IDNA -#include "unicode/ustring.h" -#include "unicode/utf.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/utf.h> +#include <_foundation_unicode/utf16.h> #include "ustr_imp.h" #include "cstring.h" #include "cmemory.h" diff --git a/icuSources/common/punycode.h b/icuSources/common/punycode.h index 9e28f77..2d67c4b 100644 --- a/icuSources/common/punycode.h +++ b/icuSources/common/punycode.h @@ -27,7 +27,7 @@ Adam M. Costello #ifndef __PUNYCODE_H__ #define __PUNYCODE_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_IDNA diff --git a/icuSources/common/putil.cpp b/icuSources/common/putil.cpp index 0eac167..5e7d8e0 100644 --- a/icuSources/common/putil.cpp +++ b/icuSources/common/putil.cpp @@ -44,7 +44,7 @@ #include "uposixdefs.h" // First, the platform type. Need this for U_PLATFORM. -#include "unicode/platform.h" +#include <_foundation_unicode/platform.h> #if U_PLATFORM == U_PF_MINGW && defined __STRICT_ANSI__ /* tzset isn't defined in strict ANSI on MinGW. */ @@ -61,8 +61,8 @@ #endif /* include the rest of the ICU headers */ -#include "unicode/putil.h" -#include "unicode/ustring.h" +#include <_foundation_unicode/putil.h> +#include <_foundation_unicode/ustring.h> #include "putilimp.h" #include "uassert.h" #include "umutex.h" @@ -101,7 +101,7 @@ # define NOIME # define NOMCX # include -# include "unicode/uloc.h" +# include "_foundation_unicode/uloc.h" # include "wintz.h" #elif U_PLATFORM == U_PF_OS400 # include @@ -110,7 +110,7 @@ # include /* EPT_CALL macro - this include must be after all other "QSYSINCs" */ # include /* For uprv_maximumPtr */ #elif U_PLATFORM == U_PF_OS390 -# include "unicode/ucnv.h" /* Needed for UCNV_SWAP_LFNL_OPTION_STRING */ +# include "_foundation_unicode/ucnv.h" /* Needed for UCNV_SWAP_LFNL_OPTION_STRING */ #elif U_PLATFORM_IS_DARWIN_BASED || U_PLATFORM_IS_LINUX_BASED || U_PLATFORM == U_PF_BSD || U_PLATFORM == U_PF_SOLARIS # include # include diff --git a/icuSources/common/putilimp.h b/icuSources/common/putilimp.h index 5b95a68..6e81385 100644 --- a/icuSources/common/putilimp.h +++ b/icuSources/common/putilimp.h @@ -18,8 +18,8 @@ #ifndef PUTILIMP_H #define PUTILIMP_H -#include "unicode/utypes.h" -#include "unicode/putil.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/putil.h> /** * \def U_SIGNED_RIGHT_SHIFT_IS_ARITHMETIC diff --git a/icuSources/common/rbbi.cpp b/icuSources/common/rbbi.cpp index ddcec61..95ee329 100644 --- a/icuSources/common/rbbi.cpp +++ b/icuSources/common/rbbi.cpp @@ -14,20 +14,20 @@ #include "utypeinfo.h" // for 'typeid' to work -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_BREAK_ITERATION #include -#include "unicode/rbbi.h" -#include "unicode/schriter.h" -#include "unicode/uchriter.h" -#include "unicode/uclean.h" -#include "unicode/udata.h" +#include <_foundation_unicode/rbbi.h> +#include <_foundation_unicode/schriter.h> +#include <_foundation_unicode/uchriter.h> +#include <_foundation_unicode/uclean.h> +#include <_foundation_unicode/udata.h> #if APPLE_ICU_CHANGES // rdar://51193810 for line break, remap locale delimiters that are QU to OP/CL as appropriate -#include "unicode/ulocdata.h" +#include <_foundation_unicode/ulocdata.h> #endif // APPLE_ICU_CHANGES #include "brkeng.h" diff --git a/icuSources/common/rbbi57.cpp b/icuSources/common/rbbi57.cpp index 6f69b8d..a04cad6 100644 --- a/icuSources/common/rbbi57.cpp +++ b/icuSources/common/rbbi57.cpp @@ -16,15 +16,15 @@ #include "utypeinfo.h" // for 'typeid' to work -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_BREAK_ITERATION -#include "unicode/schriter.h" -#include "unicode/uchriter.h" -#include "unicode/udata.h" -#include "unicode/uclean.h" -#include "unicode/utext.h" +#include <_foundation_unicode/schriter.h> +#include <_foundation_unicode/uchriter.h> +#include <_foundation_unicode/udata.h> +#include <_foundation_unicode/uclean.h> +#include <_foundation_unicode/utext.h> #include "rbbidata57.h" #include "rbbirb57.h" #include "rbbi57.h" diff --git a/icuSources/common/rbbi57.h b/icuSources/common/rbbi57.h index e15e756..eaf95e8 100644 --- a/icuSources/common/rbbi57.h +++ b/icuSources/common/rbbi57.h @@ -17,7 +17,7 @@ #ifndef RBBI57_H #define RBBI57_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> /** * \file @@ -26,11 +26,11 @@ #if !UCONFIG_NO_BREAK_ITERATION -#include "unicode/brkiter.h" -#include "unicode/udata.h" -#include "unicode/parseerr.h" -#include "unicode/schriter.h" -#include "unicode/uchriter.h" +#include <_foundation_unicode/brkiter.h> +#include <_foundation_unicode/udata.h> +#include <_foundation_unicode/parseerr.h> +#include <_foundation_unicode/schriter.h> +#include <_foundation_unicode/uchriter.h> #include "rbbidata57.h" #include "rbbirb57.h" diff --git a/icuSources/common/rbbi_cache.cpp b/icuSources/common/rbbi_cache.cpp index 45e0252..e735d62 100644 --- a/icuSources/common/rbbi_cache.cpp +++ b/icuSources/common/rbbi_cache.cpp @@ -3,12 +3,12 @@ // file: rbbi_cache.cpp -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_BREAK_ITERATION -#include "unicode/ubrk.h" -#include "unicode/rbbi.h" +#include <_foundation_unicode/ubrk.h> +#include <_foundation_unicode/rbbi.h> #include "rbbi_cache.h" diff --git a/icuSources/common/rbbi_cache.h b/icuSources/common/rbbi_cache.h index 597312e..a202f26 100644 --- a/icuSources/common/rbbi_cache.h +++ b/icuSources/common/rbbi_cache.h @@ -6,12 +6,12 @@ #ifndef RBBI_CACHE_H #define RBBI_CACHE_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_BREAK_ITERATION -#include "unicode/rbbi.h" -#include "unicode/uobject.h" +#include <_foundation_unicode/rbbi.h> +#include <_foundation_unicode/uobject.h> #include "uvectr32.h" diff --git a/icuSources/common/rbbidata.cpp b/icuSources/common/rbbidata.cpp index f50fc45..bbef0d7 100644 --- a/icuSources/common/rbbidata.cpp +++ b/icuSources/common/rbbidata.cpp @@ -7,12 +7,12 @@ *************************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_BREAK_ITERATION -#include "unicode/ucptrie.h" -#include "unicode/utypes.h" +#include <_foundation_unicode/ucptrie.h> +#include <_foundation_unicode/utypes.h> #include "rbbidata.h" #include "rbbirb.h" #include "udatamem.h" diff --git a/icuSources/common/rbbidata.h b/icuSources/common/rbbidata.h index 1bc76d5..7651046 100644 --- a/icuSources/common/rbbidata.h +++ b/icuSources/common/rbbidata.h @@ -34,8 +34,8 @@ #ifndef __RBBIDATA_H__ #define __RBBIDATA_H__ -#include "unicode/utypes.h" -#include "unicode/udata.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/udata.h> #include "udataswp.h" /** @@ -49,10 +49,10 @@ ubrk_swap(const UDataSwapper *ds, #ifdef __cplusplus -#include "unicode/ucptrie.h" -#include "unicode/uobject.h" -#include "unicode/unistr.h" -#include "unicode/uversion.h" +#include <_foundation_unicode/ucptrie.h> +#include <_foundation_unicode/uobject.h> +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/uversion.h> #include "umutex.h" diff --git a/icuSources/common/rbbidata57.cpp b/icuSources/common/rbbidata57.cpp index c4c0e2c..d5ba259 100644 --- a/icuSources/common/rbbidata57.cpp +++ b/icuSources/common/rbbidata57.cpp @@ -13,11 +13,11 @@ ********************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_BREAK_ITERATION -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #include "rbbidata57.h" #include "rbbirb57.h" #include "utrie.h" diff --git a/icuSources/common/rbbidata57.h b/icuSources/common/rbbidata57.h index 4049324..51d1a63 100644 --- a/icuSources/common/rbbidata57.h +++ b/icuSources/common/rbbidata57.h @@ -37,15 +37,15 @@ #ifndef __RBBIDATA57_H__ #define __RBBIDATA57_H__ -#include "unicode/utypes.h" -#include "unicode/udata.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/udata.h> #include "udataswp.h" #include "rbbidata.h" #ifdef __cplusplus -#include "unicode/uobject.h" -#include "unicode/unistr.h" +#include <_foundation_unicode/uobject.h> +#include <_foundation_unicode/unistr.h> #include "umutex.h" #include "utrie.h" diff --git a/icuSources/common/rbbinode.cpp b/icuSources/common/rbbinode.cpp index da5937c..e41eee4 100644 --- a/icuSources/common/rbbinode.cpp +++ b/icuSources/common/rbbinode.cpp @@ -17,14 +17,14 @@ // Code using it is expected to directly access fields much of the time. // -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_BREAK_ITERATION -#include "unicode/unistr.h" -#include "unicode/uniset.h" -#include "unicode/uchar.h" -#include "unicode/parsepos.h" +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/uniset.h> +#include <_foundation_unicode/uchar.h> +#include <_foundation_unicode/parsepos.h> #include "cstr.h" #include "uvector.h" diff --git a/icuSources/common/rbbinode.h b/icuSources/common/rbbinode.h index 4ed84d4..712cd26 100644 --- a/icuSources/common/rbbinode.h +++ b/icuSources/common/rbbinode.h @@ -9,9 +9,9 @@ #ifndef RBBINODE_H #define RBBINODE_H -#include "unicode/utypes.h" -#include "unicode/unistr.h" -#include "unicode/uobject.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/uobject.h> // // class RBBINode diff --git a/icuSources/common/rbbirb.cpp b/icuSources/common/rbbirb.cpp index a9d76f2..7b6f484 100644 --- a/icuSources/common/rbbirb.cpp +++ b/icuSources/common/rbbirb.cpp @@ -11,20 +11,20 @@ // RBBI engine. // -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_BREAK_ITERATION -#include "unicode/brkiter.h" -#include "unicode/rbbi.h" -#include "unicode/ubrk.h" -#include "unicode/unistr.h" -#include "unicode/uniset.h" -#include "unicode/uchar.h" -#include "unicode/uchriter.h" -#include "unicode/ustring.h" -#include "unicode/parsepos.h" -#include "unicode/parseerr.h" +#include <_foundation_unicode/brkiter.h> +#include <_foundation_unicode/rbbi.h> +#include <_foundation_unicode/ubrk.h> +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/uniset.h> +#include <_foundation_unicode/uchar.h> +#include <_foundation_unicode/uchriter.h> +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/parsepos.h> +#include <_foundation_unicode/parseerr.h> #include "cmemory.h" #include "cstring.h" diff --git a/icuSources/common/rbbirb.h b/icuSources/common/rbbirb.h index d983a18..2e4da01 100644 --- a/icuSources/common/rbbirb.h +++ b/icuSources/common/rbbirb.h @@ -14,19 +14,19 @@ #ifndef RBBIRB_H #define RBBIRB_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_BREAK_ITERATION #include -#include "unicode/uobject.h" -#include "unicode/rbbi.h" -#include "unicode/uniset.h" -#include "unicode/parseerr.h" +#include <_foundation_unicode/uobject.h> +#include <_foundation_unicode/rbbi.h> +#include <_foundation_unicode/uniset.h> +#include <_foundation_unicode/parseerr.h> #include "uhash.h" #include "uvector.h" -#include "unicode/symtable.h"// For UnicodeSet parsing, is the interface that +#include <_foundation_unicode/symtable.h>// For UnicodeSet parsing, is the interface that // looks up references to $variables within a set. diff --git a/icuSources/common/rbbirb57.cpp b/icuSources/common/rbbirb57.cpp index 263eb14..38f6dbc 100644 --- a/icuSources/common/rbbirb57.cpp +++ b/icuSources/common/rbbirb57.cpp @@ -10,18 +10,18 @@ // urbtok57 interfaces for access via RBT, and better tests //********************************************************************* -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_BREAK_ITERATION -#include "unicode/brkiter.h" -#include "unicode/ubrk.h" -#include "unicode/unistr.h" -#include "unicode/uniset.h" -#include "unicode/uchar.h" -#include "unicode/uchriter.h" -#include "unicode/parsepos.h" -#include "unicode/parseerr.h" +#include <_foundation_unicode/brkiter.h> +#include <_foundation_unicode/ubrk.h> +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/uniset.h> +#include <_foundation_unicode/uchar.h> +#include <_foundation_unicode/uchriter.h> +#include <_foundation_unicode/parsepos.h> +#include <_foundation_unicode/parseerr.h> #include "cmemory.h" #include "cstring.h" diff --git a/icuSources/common/rbbirb57.h b/icuSources/common/rbbirb57.h index 5ad905f..4e340f3 100644 --- a/icuSources/common/rbbirb57.h +++ b/icuSources/common/rbbirb57.h @@ -13,13 +13,13 @@ #ifndef RBBIRB57_H #define RBBIRB57_H -#include "unicode/utypes.h" -#include "unicode/uobject.h" -#include "unicode/uniset.h" -#include "unicode/parseerr.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/uobject.h> +#include <_foundation_unicode/uniset.h> +#include <_foundation_unicode/parseerr.h> #include "uhash.h" #include "uvector.h" -#include "unicode/symtable.h"// For UnicodeSet parsing, is the interface that +#include <_foundation_unicode/symtable.h>// For UnicodeSet parsing, is the interface that // looks up references to $variables within a set. #include "rbbidata57.h" #include "rbbisetb57.h" diff --git a/icuSources/common/rbbirpt.h b/icuSources/common/rbbirpt.h index ca1bcf4..5b681b5 100644 --- a/icuSources/common/rbbirpt.h +++ b/icuSources/common/rbbirpt.h @@ -15,7 +15,7 @@ #ifndef RBBIRPT_H #define RBBIRPT_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> U_NAMESPACE_BEGIN // diff --git a/icuSources/common/rbbiscan.cpp b/icuSources/common/rbbiscan.cpp index 92cf776..368e555 100644 --- a/icuSources/common/rbbiscan.cpp +++ b/icuSources/common/rbbiscan.cpp @@ -14,16 +14,16 @@ // create and use an instance of this class as part of the process. // -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_BREAK_ITERATION -#include "unicode/unistr.h" -#include "unicode/uniset.h" -#include "unicode/uchar.h" -#include "unicode/uchriter.h" -#include "unicode/parsepos.h" -#include "unicode/parseerr.h" +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/uniset.h> +#include <_foundation_unicode/uchar.h> +#include <_foundation_unicode/uchriter.h> +#include <_foundation_unicode/parsepos.h> +#include <_foundation_unicode/parseerr.h> #include "cmemory.h" #include "cstring.h" diff --git a/icuSources/common/rbbiscan.h b/icuSources/common/rbbiscan.h index bf32038..6194b2a 100644 --- a/icuSources/common/rbbiscan.h +++ b/icuSources/common/rbbiscan.h @@ -13,14 +13,14 @@ #ifndef RBBISCAN_H #define RBBISCAN_H -#include "unicode/utypes.h" -#include "unicode/uobject.h" -#include "unicode/rbbi.h" -#include "unicode/uniset.h" -#include "unicode/parseerr.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/uobject.h> +#include <_foundation_unicode/rbbi.h> +#include <_foundation_unicode/uniset.h> +#include <_foundation_unicode/parseerr.h> #include "uhash.h" #include "uvector.h" -#include "unicode/symtable.h"// For UnicodeSet parsing, is the interface that +#include <_foundation_unicode/symtable.h>// For UnicodeSet parsing, is the interface that // looks up references to $variables within a set. #include "rbbinode.h" #include "rbbirpt.h" diff --git a/icuSources/common/rbbiscan57.cpp b/icuSources/common/rbbiscan57.cpp index 6331077..c885603 100644 --- a/icuSources/common/rbbiscan57.cpp +++ b/icuSources/common/rbbiscan57.cpp @@ -18,16 +18,16 @@ //******************************************************************** -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_BREAK_ITERATION -#include "unicode/unistr.h" -#include "unicode/uniset.h" -#include "unicode/uchar.h" -#include "unicode/uchriter.h" -#include "unicode/parsepos.h" -#include "unicode/parseerr.h" +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/uniset.h> +#include <_foundation_unicode/uchar.h> +#include <_foundation_unicode/uchriter.h> +#include <_foundation_unicode/parsepos.h> +#include <_foundation_unicode/parseerr.h> #include "cmemory.h" #include "cstring.h" diff --git a/icuSources/common/rbbiscan57.h b/icuSources/common/rbbiscan57.h index f4e6448..15bb3b7 100644 --- a/icuSources/common/rbbiscan57.h +++ b/icuSources/common/rbbiscan57.h @@ -18,13 +18,13 @@ #ifndef RBBISCAN57_H #define RBBISCAN57_H -#include "unicode/utypes.h" -#include "unicode/uobject.h" -#include "unicode/uniset.h" -#include "unicode/parseerr.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/uobject.h> +#include <_foundation_unicode/uniset.h> +#include <_foundation_unicode/parseerr.h> #include "uhash.h" #include "uvector.h" -#include "unicode/symtable.h"// For UnicodeSet parsing, is the interface that +#include <_foundation_unicode/symtable.h>// For UnicodeSet parsing, is the interface that // looks up references to $variables within a set. #include "rbbi57.h" #include "rbbinode.h" diff --git a/icuSources/common/rbbisetb.cpp b/icuSources/common/rbbisetb.cpp index 11c4715..606056f 100644 --- a/icuSources/common/rbbisetb.cpp +++ b/icuSources/common/rbbisetb.cpp @@ -30,11 +30,11 @@ // the previous step. // -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_BREAK_ITERATION -#include "unicode/uniset.h" +#include <_foundation_unicode/uniset.h> #include "uvector.h" #include "uassert.h" #include "cmemory.h" diff --git a/icuSources/common/rbbisetb.h b/icuSources/common/rbbisetb.h index cd09d33..473b472 100644 --- a/icuSources/common/rbbisetb.h +++ b/icuSources/common/rbbisetb.h @@ -12,13 +12,13 @@ #ifndef RBBISETB_H #define RBBISETB_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_BREAK_ITERATION -#include "unicode/ucptrie.h" -#include "unicode/umutablecptrie.h" -#include "unicode/uobject.h" +#include <_foundation_unicode/ucptrie.h> +#include <_foundation_unicode/umutablecptrie.h> +#include <_foundation_unicode/uobject.h> #include "rbbirb.h" #include "uvector.h" diff --git a/icuSources/common/rbbisetb57.cpp b/icuSources/common/rbbisetb57.cpp index 80a225e..d5643db 100644 --- a/icuSources/common/rbbisetb57.cpp +++ b/icuSources/common/rbbisetb57.cpp @@ -33,11 +33,11 @@ // urbtok57 interfaces for access via RBT, and better tests //******************************************************************** -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_BREAK_ITERATION -#include "unicode/uniset.h" +#include <_foundation_unicode/uniset.h> #include "utrie.h" #include "uvector.h" #include "uassert.h" diff --git a/icuSources/common/rbbisetb57.h b/icuSources/common/rbbisetb57.h index 998991b..5c52929 100644 --- a/icuSources/common/rbbisetb57.h +++ b/icuSources/common/rbbisetb57.h @@ -17,8 +17,8 @@ #ifndef RBBISETB57_H #define RBBISETB57_H -#include "unicode/utypes.h" -#include "unicode/uobject.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/uobject.h> #include "rbbirb57.h" #include "rbbinode.h" #include "uvector.h" diff --git a/icuSources/common/rbbistbl.cpp b/icuSources/common/rbbistbl.cpp index 554aeb7..ba12252 100644 --- a/icuSources/common/rbbistbl.cpp +++ b/icuSources/common/rbbistbl.cpp @@ -10,14 +10,14 @@ *************************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_BREAK_ITERATION -#include "unicode/unistr.h" -#include "unicode/uniset.h" -#include "unicode/uchar.h" -#include "unicode/parsepos.h" +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/uniset.h> +#include <_foundation_unicode/uchar.h> +#include <_foundation_unicode/parsepos.h> #include "cstr.h" #include "rbbinode.h" diff --git a/icuSources/common/rbbistbl57.cpp b/icuSources/common/rbbistbl57.cpp index cb8f132..ad849d0 100644 --- a/icuSources/common/rbbistbl57.cpp +++ b/icuSources/common/rbbistbl57.cpp @@ -13,14 +13,14 @@ ********************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_BREAK_ITERATION -#include "unicode/unistr.h" -#include "unicode/uniset.h" -#include "unicode/uchar.h" -#include "unicode/parsepos.h" +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/uniset.h> +#include <_foundation_unicode/uchar.h> +#include <_foundation_unicode/parsepos.h> #include "umutex.h" diff --git a/icuSources/common/rbbitblb.cpp b/icuSources/common/rbbitblb.cpp index 0e3ec79..94a20ca 100644 --- a/icuSources/common/rbbitblb.cpp +++ b/icuSources/common/rbbitblb.cpp @@ -11,11 +11,11 @@ // -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_BREAK_ITERATION -#include "unicode/unistr.h" +#include <_foundation_unicode/unistr.h> #include "rbbitblb.h" #include "rbbirb.h" #include "rbbiscan.h" diff --git a/icuSources/common/rbbitblb.h b/icuSources/common/rbbitblb.h index 2ac66da..c2ed341 100644 --- a/icuSources/common/rbbitblb.h +++ b/icuSources/common/rbbitblb.h @@ -14,12 +14,12 @@ #ifndef RBBITBLB_H #define RBBITBLB_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_BREAK_ITERATION -#include "unicode/uobject.h" -#include "unicode/rbbi.h" +#include <_foundation_unicode/uobject.h> +#include <_foundation_unicode/rbbi.h> #include "rbbidata.h" #include "rbbirb.h" #include "rbbinode.h" diff --git a/icuSources/common/rbbitblb57.cpp b/icuSources/common/rbbitblb57.cpp index 37f1f59..9b7a4a4 100644 --- a/icuSources/common/rbbitblb57.cpp +++ b/icuSources/common/rbbitblb57.cpp @@ -14,11 +14,11 @@ */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_BREAK_ITERATION -#include "unicode/unistr.h" +#include <_foundation_unicode/unistr.h> #include "rbbitblb57.h" #include "rbbirb57.h" #include "rbbisetb57.h" diff --git a/icuSources/common/rbbitblb57.h b/icuSources/common/rbbitblb57.h index d057d9f..941f36d 100644 --- a/icuSources/common/rbbitblb57.h +++ b/icuSources/common/rbbitblb57.h @@ -17,8 +17,8 @@ #ifndef RBBITBLB57_H #define RBBITBLB57_H -#include "unicode/utypes.h" -#include "unicode/uobject.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/uobject.h> #include "uvectr32.h" #include "rbbitblb.h" #include "rbbi57.h" diff --git a/icuSources/common/rbtok.cpp b/icuSources/common/rbtok.cpp index c02b95a..d169dd4 100644 --- a/icuSources/common/rbtok.cpp +++ b/icuSources/common/rbtok.cpp @@ -7,12 +7,12 @@ *************************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_BREAK_ITERATION -#include "unicode/ustring.h" -#include "unicode/utext.h" +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/utext.h> #include "rbbidata57.h" #include "rbbi57.h" #include "rbtok.h" diff --git a/icuSources/common/rbtok.h b/icuSources/common/rbtok.h index 9a6410b..63e7ef4 100644 --- a/icuSources/common/rbtok.h +++ b/icuSources/common/rbtok.h @@ -20,7 +20,7 @@ #ifndef RBTOK_H #define RBTOK_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> /** * \file @@ -29,8 +29,8 @@ #if !UCONFIG_NO_BREAK_ITERATION -#include "unicode/urbtok.h" -#include "unicode/parseerr.h" +#include <_foundation_unicode/urbtok.h> +#include <_foundation_unicode/parseerr.h> #include "rbbidata57.h" #include "rbbi57.h" diff --git a/icuSources/common/resbund.cpp b/icuSources/common/resbund.cpp index 8591a62..b262e3d 100644 --- a/icuSources/common/resbund.cpp +++ b/icuSources/common/resbund.cpp @@ -48,8 +48,8 @@ ****************************************************************************** */ -#include "unicode/utypes.h" -#include "unicode/resbund.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/resbund.h> #include "cmemory.h" #include "mutex.h" diff --git a/icuSources/common/resbund_cnv.cpp b/icuSources/common/resbund_cnv.cpp index 45c0b39..85106dd 100644 --- a/icuSources/common/resbund_cnv.cpp +++ b/icuSources/common/resbund_cnv.cpp @@ -18,8 +18,8 @@ * Character conversion functions moved here from resbund.cpp */ -#include "unicode/utypes.h" -#include "unicode/resbund.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/resbund.h> #include "uinvchar.h" U_NAMESPACE_BEGIN diff --git a/icuSources/common/resource.h b/icuSources/common/resource.h index de79343..40dc2a2 100644 --- a/icuSources/common/resource.h +++ b/icuSources/common/resource.h @@ -25,9 +25,9 @@ // We use the Resource prefix for C++ classes, as usual. // The UResource prefix would be used for C types. -#include "unicode/utypes.h" -#include "unicode/unistr.h" -#include "unicode/ures.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/ures.h> #include "restrace.h" struct ResourceData; diff --git a/icuSources/common/restrace.cpp b/icuSources/common/restrace.cpp index 1f83372..97b04c0 100644 --- a/icuSources/common/restrace.cpp +++ b/icuSources/common/restrace.cpp @@ -1,7 +1,7 @@ // © 2019 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_ENABLE_TRACING diff --git a/icuSources/common/restrace.h b/icuSources/common/restrace.h index ef29eae..25bd7b3 100644 --- a/icuSources/common/restrace.h +++ b/icuSources/common/restrace.h @@ -4,7 +4,7 @@ #ifndef __RESTRACE_H__ #define __RESTRACE_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_ENABLE_TRACING diff --git a/icuSources/common/ruleiter.cpp b/icuSources/common/ruleiter.cpp index 33ffd3d..8d33425 100644 --- a/icuSources/common/ruleiter.cpp +++ b/icuSources/common/ruleiter.cpp @@ -11,10 +11,10 @@ ********************************************************************** */ #include "ruleiter.h" -#include "unicode/parsepos.h" -#include "unicode/symtable.h" -#include "unicode/unistr.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/parsepos.h> +#include <_foundation_unicode/symtable.h> +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/utf16.h> #include "patternprops.h" /* \U87654321 or \ud800\udc00 */ diff --git a/icuSources/common/ruleiter.h b/icuSources/common/ruleiter.h index 4173140..928749e 100644 --- a/icuSources/common/ruleiter.h +++ b/icuSources/common/ruleiter.h @@ -13,7 +13,7 @@ #ifndef _RULEITER_H_ #define _RULEITER_H_ -#include "unicode/uobject.h" +#include <_foundation_unicode/uobject.h> U_NAMESPACE_BEGIN diff --git a/icuSources/common/schriter.cpp b/icuSources/common/schriter.cpp index 83b3db4..2065665 100644 --- a/icuSources/common/schriter.cpp +++ b/icuSources/common/schriter.cpp @@ -17,8 +17,8 @@ #include "utypeinfo.h" // for 'typeid' to work -#include "unicode/chariter.h" -#include "unicode/schriter.h" +#include <_foundation_unicode/chariter.h> +#include <_foundation_unicode/schriter.h> U_NAMESPACE_BEGIN diff --git a/icuSources/common/serv.cpp b/icuSources/common/serv.cpp index 9d8c041..72c8907 100644 --- a/icuSources/common/serv.cpp +++ b/icuSources/common/serv.cpp @@ -7,8 +7,8 @@ ******************************************************************************* */ -#include "unicode/utypes.h" -#include "unicode/localpointer.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/localpointer.h> #if !UCONFIG_NO_SERVICE diff --git a/icuSources/common/serv.h b/icuSources/common/serv.h index 3bd3d9a..76a8a11 100644 --- a/icuSources/common/serv.h +++ b/icuSources/common/serv.h @@ -10,7 +10,7 @@ #ifndef ICUSERV_H #define ICUSERV_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if UCONFIG_NO_SERVICE @@ -26,9 +26,9 @@ U_NAMESPACE_END #else -#include "unicode/unistr.h" -#include "unicode/locid.h" -#include "unicode/umisc.h" +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/locid.h> +#include <_foundation_unicode/umisc.h> #include "hash.h" #include "uvector.h" diff --git a/icuSources/common/servlk.cpp b/icuSources/common/servlk.cpp index 7021806..aa54d1f 100644 --- a/icuSources/common/servlk.cpp +++ b/icuSources/common/servlk.cpp @@ -8,11 +8,11 @@ * ******************************************************************************* */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_SERVICE -#include "unicode/resbund.h" +#include <_foundation_unicode/resbund.h> #include "uresimp.h" #include "cmemory.h" #include "servloc.h" diff --git a/icuSources/common/servlkf.cpp b/icuSources/common/servlkf.cpp index 7ccb0c7..9af2fc3 100644 --- a/icuSources/common/servlkf.cpp +++ b/icuSources/common/servlkf.cpp @@ -8,11 +8,11 @@ * ******************************************************************************* */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_SERVICE -#include "unicode/resbund.h" +#include <_foundation_unicode/resbund.h> #include "uresimp.h" #include "cmemory.h" #include "servloc.h" diff --git a/icuSources/common/servloc.h b/icuSources/common/servloc.h index 29c50a2..fd3ac47 100644 --- a/icuSources/common/servloc.h +++ b/icuSources/common/servloc.h @@ -11,7 +11,7 @@ #ifndef ICULSERV_H #define ICULSERV_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if UCONFIG_NO_SERVICE @@ -27,9 +27,9 @@ U_NAMESPACE_END #else -#include "unicode/unistr.h" -#include "unicode/locid.h" -#include "unicode/strenum.h" +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/locid.h> +#include <_foundation_unicode/strenum.h> #include "hash.h" #include "uvector.h" diff --git a/icuSources/common/servls.cpp b/icuSources/common/servls.cpp index 1948112..cb8603e 100644 --- a/icuSources/common/servls.cpp +++ b/icuSources/common/servls.cpp @@ -8,11 +8,11 @@ * ******************************************************************************* */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_SERVICE -#include "unicode/resbund.h" +#include <_foundation_unicode/resbund.h> #include "uresimp.h" #include "cmemory.h" #include "servloc.h" diff --git a/icuSources/common/servnotf.cpp b/icuSources/common/servnotf.cpp index d9fb388..6dfd174 100644 --- a/icuSources/common/servnotf.cpp +++ b/icuSources/common/servnotf.cpp @@ -7,7 +7,7 @@ ******************************************************************************* */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_SERVICE diff --git a/icuSources/common/servnotf.h b/icuSources/common/servnotf.h index e3b2cac..b147428 100644 --- a/icuSources/common/servnotf.h +++ b/icuSources/common/servnotf.h @@ -9,7 +9,7 @@ #ifndef ICUNOTIF_H #define ICUNOTIF_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if UCONFIG_NO_SERVICE @@ -25,8 +25,8 @@ U_NAMESPACE_END #else -#include "unicode/uobject.h" -#include "unicode/unistr.h" +#include <_foundation_unicode/uobject.h> +#include <_foundation_unicode/unistr.h> #include "mutex.h" #include "uvector.h" diff --git a/icuSources/common/servrbf.cpp b/icuSources/common/servrbf.cpp index 94279ab..a61cf52 100644 --- a/icuSources/common/servrbf.cpp +++ b/icuSources/common/servrbf.cpp @@ -8,11 +8,11 @@ * ******************************************************************************* */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_SERVICE -#include "unicode/resbund.h" +#include <_foundation_unicode/resbund.h> #include "uresimp.h" #include "cmemory.h" #include "servloc.h" diff --git a/icuSources/common/servslkf.cpp b/icuSources/common/servslkf.cpp index 09154d1..a8afb33 100644 --- a/icuSources/common/servslkf.cpp +++ b/icuSources/common/servslkf.cpp @@ -8,11 +8,11 @@ * ******************************************************************************* */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_SERVICE -#include "unicode/resbund.h" +#include <_foundation_unicode/resbund.h> #include "uresimp.h" #include "cmemory.h" #include "servloc.h" diff --git a/icuSources/common/sharedobject.h b/icuSources/common/sharedobject.h index 6298662..78acc39 100644 --- a/icuSources/common/sharedobject.h +++ b/icuSources/common/sharedobject.h @@ -12,7 +12,7 @@ #define __SHAREDOBJECT_H__ -#include "unicode/uobject.h" +#include <_foundation_unicode/uobject.h> #include "umutex.h" U_NAMESPACE_BEGIN diff --git a/icuSources/common/simpleformatter.cpp b/icuSources/common/simpleformatter.cpp index f10e49f..e203d36 100644 --- a/icuSources/common/simpleformatter.cpp +++ b/icuSources/common/simpleformatter.cpp @@ -8,9 +8,9 @@ * simpleformatter.cpp */ -#include "unicode/utypes.h" -#include "unicode/simpleformatter.h" -#include "unicode/unistr.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/simpleformatter.h> +#include <_foundation_unicode/unistr.h> #include "uassert.h" U_NAMESPACE_BEGIN diff --git a/icuSources/common/sprpimpl.h b/icuSources/common/sprpimpl.h index ca0bcdb..64a4fad 100644 --- a/icuSources/common/sprpimpl.h +++ b/icuSources/common/sprpimpl.h @@ -19,14 +19,14 @@ #ifndef SPRPIMPL_H #define SPRPIMPL_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_IDNA -#include "unicode/ustring.h" -#include "unicode/parseerr.h" -#include "unicode/usprep.h" -#include "unicode/udata.h" +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/parseerr.h> +#include <_foundation_unicode/usprep.h> +#include <_foundation_unicode/udata.h> #include "utrie.h" #include "udataswp.h" #include "ubidi_props.h" diff --git a/icuSources/common/static_unicode_sets.cpp b/icuSources/common/static_unicode_sets.cpp index db9432f..6d3f0fd 100644 --- a/icuSources/common/static_unicode_sets.cpp +++ b/icuSources/common/static_unicode_sets.cpp @@ -1,7 +1,7 @@ // © 2018 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING @@ -12,7 +12,7 @@ #include "static_unicode_sets.h" #include "umutex.h" #include "ucln_cmn.h" -#include "unicode/uniset.h" +#include <_foundation_unicode/uniset.h> #include "uresimp.h" #include "cstring.h" #include "uassert.h" diff --git a/icuSources/common/static_unicode_sets.h b/icuSources/common/static_unicode_sets.h index 5d90ce5..6462bae 100644 --- a/icuSources/common/static_unicode_sets.h +++ b/icuSources/common/static_unicode_sets.h @@ -13,14 +13,14 @@ // // Author: sffc -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #ifndef __STATIC_UNICODE_SETS_H__ #define __STATIC_UNICODE_SETS_H__ -#include "unicode/uniset.h" -#include "unicode/unistr.h" +#include <_foundation_unicode/uniset.h> +#include <_foundation_unicode/unistr.h> U_NAMESPACE_BEGIN namespace unisets { diff --git a/icuSources/common/stringpiece.cpp b/icuSources/common/stringpiece.cpp index 99089e0..1b3e224 100644 --- a/icuSources/common/stringpiece.cpp +++ b/icuSources/common/stringpiece.cpp @@ -8,8 +8,8 @@ // Author: wilsonh@google.com (Wilson Hsieh) // -#include "unicode/utypes.h" -#include "unicode/stringpiece.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/stringpiece.h> #include "cstring.h" #include "cmemory.h" diff --git a/icuSources/common/stringtriebuilder.cpp b/icuSources/common/stringtriebuilder.cpp index e6670d1..59cf908 100644 --- a/icuSources/common/stringtriebuilder.cpp +++ b/icuSources/common/stringtriebuilder.cpp @@ -15,8 +15,8 @@ */ #include "utypeinfo.h" // for 'typeid' to work -#include "unicode/utypes.h" -#include "unicode/stringtriebuilder.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/stringtriebuilder.h> #include "uassert.h" #include "uhash.h" diff --git a/icuSources/common/ualoc.cpp b/icuSources/common/ualoc.cpp index b9d4c3e..f5d3420 100644 --- a/icuSources/common/ualoc.cpp +++ b/icuSources/common/ualoc.cpp @@ -11,12 +11,12 @@ #include #include #include -#include "unicode/utypes.h" -#include "unicode/ualoc.h" -#include "unicode/uloc.h" -#include "unicode/ures.h" -#include "unicode/putil.h" -#include "unicode/ustring.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/ualoc.h> +#include <_foundation_unicode/uloc.h> +#include <_foundation_unicode/ures.h> +#include <_foundation_unicode/putil.h> +#include <_foundation_unicode/ustring.h> #include "cstring.h" #include "cmemory.h" #include "uhash.h" diff --git a/icuSources/common/uarrsort.cpp b/icuSources/common/uarrsort.cpp index 17b6964..06f82ec 100644 --- a/icuSources/common/uarrsort.cpp +++ b/icuSources/common/uarrsort.cpp @@ -20,7 +20,7 @@ #include -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #include "cmemory.h" #include "uarrsort.h" diff --git a/icuSources/common/uarrsort.h b/icuSources/common/uarrsort.h index a55dca5..64e3cb9 100644 --- a/icuSources/common/uarrsort.h +++ b/icuSources/common/uarrsort.h @@ -21,7 +21,7 @@ #ifndef __UARRSORT_H__ #define __UARRSORT_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> U_CDECL_BEGIN /** diff --git a/icuSources/common/uassert.h b/icuSources/common/uassert.h index 5218752..26dc04e 100644 --- a/icuSources/common/uassert.h +++ b/icuSources/common/uassert.h @@ -18,7 +18,7 @@ #define U_ASSERT_H /* utypes.h is included to get the proper define for uint8_t */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> /* for abort */ #include diff --git a/icuSources/common/ubidi.cpp b/icuSources/common/ubidi.cpp index af5186b..cdda293 100644 --- a/icuSources/common/ubidi.cpp +++ b/icuSources/common/ubidi.cpp @@ -18,11 +18,11 @@ */ #include "cmemory.h" -#include "unicode/utypes.h" -#include "unicode/ustring.h" -#include "unicode/uchar.h" -#include "unicode/ubidi.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/uchar.h> +#include <_foundation_unicode/ubidi.h> +#include <_foundation_unicode/utf16.h> #include "ubidi_props.h" #include "ubidiimp.h" #include "uassert.h" diff --git a/icuSources/common/ubidi_props.cpp b/icuSources/common/ubidi_props.cpp index 3ba58f7..505937a 100644 --- a/icuSources/common/ubidi_props.cpp +++ b/icuSources/common/ubidi_props.cpp @@ -18,9 +18,9 @@ * Low-level Unicode bidi/shaping properties access. */ -#include "unicode/utypes.h" -#include "unicode/uset.h" -#include "unicode/udata.h" /* UDataInfo */ +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/uset.h> +#include <_foundation_unicode/udata.h> /* UDataInfo */ #include "ucmndata.h" /* DataHeader */ #include "udatamem.h" #include "uassert.h" diff --git a/icuSources/common/ubidi_props.h b/icuSources/common/ubidi_props.h index 698ee9c..f79d490 100644 --- a/icuSources/common/ubidi_props.h +++ b/icuSources/common/ubidi_props.h @@ -21,8 +21,8 @@ #ifndef __UBIDI_PROPS_H__ #define __UBIDI_PROPS_H__ -#include "unicode/utypes.h" -#include "unicode/uset.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/uset.h> #include "putilimp.h" #include "uset_imp.h" #include "udataswp.h" diff --git a/icuSources/common/ubidiimp.h b/icuSources/common/ubidiimp.h index 6744bca..7375bc6 100644 --- a/icuSources/common/ubidiimp.h +++ b/icuSources/common/ubidiimp.h @@ -19,9 +19,9 @@ #ifndef UBIDIIMP_H #define UBIDIIMP_H -#include "unicode/utypes.h" -#include "unicode/ubidi.h" -#include "unicode/uchar.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/ubidi.h> +#include <_foundation_unicode/uchar.h> #include "ubidi_props.h" /* miscellaneous definitions ---------------------------------------------- */ diff --git a/icuSources/common/ubidiln.cpp b/icuSources/common/ubidiln.cpp index a2b74fd..4f44c26 100644 --- a/icuSources/common/ubidiln.cpp +++ b/icuSources/common/ubidiln.cpp @@ -17,10 +17,10 @@ */ #include "cmemory.h" -#include "unicode/utypes.h" -#include "unicode/ustring.h" -#include "unicode/uchar.h" -#include "unicode/ubidi.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/uchar.h> +#include <_foundation_unicode/ubidi.h> #include "ubidiimp.h" #include "uassert.h" diff --git a/icuSources/common/ubiditransform.cpp b/icuSources/common/ubiditransform.cpp index 24fffd9..476e87e 100644 --- a/icuSources/common/ubiditransform.cpp +++ b/icuSources/common/ubiditransform.cpp @@ -16,12 +16,12 @@ */ #include "cmemory.h" -#include "unicode/ubidi.h" -#include "unicode/ustring.h" -#include "unicode/ushape.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/ubidi.h> +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/ushape.h> +#include <_foundation_unicode/utf16.h> #include "ustr_imp.h" -#include "unicode/ubiditransform.h" +#include <_foundation_unicode/ubiditransform.h> /* Some convenience defines */ #define LTR UBIDI_LTR diff --git a/icuSources/common/ubidiwrt.cpp b/icuSources/common/ubidiwrt.cpp index a69c0a4..349c4ee 100644 --- a/icuSources/common/ubidiwrt.cpp +++ b/icuSources/common/ubidiwrt.cpp @@ -19,11 +19,11 @@ * the core algorithm and core API to write reordered text. */ -#include "unicode/utypes.h" -#include "unicode/ustring.h" -#include "unicode/uchar.h" -#include "unicode/ubidi.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/uchar.h> +#include <_foundation_unicode/ubidi.h> +#include <_foundation_unicode/utf16.h> #include "cmemory.h" #include "ustr_imp.h" #include "ubidiimp.h" diff --git a/icuSources/common/ubrk.cpp b/icuSources/common/ubrk.cpp index 6daf2a0..0c0a1da 100644 --- a/icuSources/common/ubrk.cpp +++ b/icuSources/common/ubrk.cpp @@ -7,17 +7,17 @@ ******************************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_BREAK_ITERATION -#include "unicode/ubrk.h" +#include <_foundation_unicode/ubrk.h> -#include "unicode/brkiter.h" -#include "unicode/uloc.h" -#include "unicode/ustring.h" -#include "unicode/uchriter.h" -#include "unicode/rbbi.h" +#include <_foundation_unicode/brkiter.h> +#include <_foundation_unicode/uloc.h> +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/uchriter.h> +#include <_foundation_unicode/rbbi.h> #include "rbbirb.h" #include "uassert.h" #include "cmemory.h" diff --git a/icuSources/common/ucase.cpp b/icuSources/common/ucase.cpp index 3d17502..b48165f 100644 --- a/icuSources/common/ucase.cpp +++ b/icuSources/common/ucase.cpp @@ -19,10 +19,10 @@ * Much code moved here (and modified) from uchar.c. */ -#include "unicode/utypes.h" -#include "unicode/unistr.h" -#include "unicode/uset.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/uset.h> +#include <_foundation_unicode/utf16.h> #include "cmemory.h" #include "uassert.h" #include "ucase.h" diff --git a/icuSources/common/ucase.h b/icuSources/common/ucase.h index 049f042..d08d194 100644 --- a/icuSources/common/ucase.h +++ b/icuSources/common/ucase.h @@ -21,8 +21,8 @@ #ifndef __UCASE_H__ #define __UCASE_H__ -#include "unicode/utypes.h" -#include "unicode/uset.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/uset.h> #include "putilimp.h" #include "uset_imp.h" #include "udataswp.h" diff --git a/icuSources/common/ucasemap.cpp b/icuSources/common/ucasemap.cpp index fc0439d..1fad134 100644 --- a/icuSources/common/ucasemap.cpp +++ b/icuSources/common/ucasemap.cpp @@ -18,23 +18,23 @@ * Case mapping service object and functions using it. */ -#include "unicode/utypes.h" -#include "unicode/brkiter.h" -#include "unicode/bytestream.h" -#include "unicode/casemap.h" -#include "unicode/edits.h" -#include "unicode/stringoptions.h" -#include "unicode/stringpiece.h" -#include "unicode/ubrk.h" -#include "unicode/uloc.h" -#include "unicode/ustring.h" -#include "unicode/ucasemap.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/brkiter.h> +#include <_foundation_unicode/bytestream.h> +#include <_foundation_unicode/casemap.h> +#include <_foundation_unicode/edits.h> +#include <_foundation_unicode/stringoptions.h> +#include <_foundation_unicode/stringpiece.h> +#include <_foundation_unicode/ubrk.h> +#include <_foundation_unicode/uloc.h> +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/ucasemap.h> #if !UCONFIG_NO_BREAK_ITERATION -#include "unicode/utext.h" +#include <_foundation_unicode/utext.h> #endif -#include "unicode/utf.h" -#include "unicode/utf8.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/utf.h> +#include <_foundation_unicode/utf8.h> +#include <_foundation_unicode/utf16.h> #include "bytesinkutil.h" #include "cmemory.h" #include "cstring.h" @@ -160,7 +160,7 @@ appendResult(int32_t cpLength, int32_t result, const UChar *s, return true; } -// See unicode/utf8.h U8_APPEND_UNSAFE(). +// See _foundation_unicode/utf8.h U8_APPEND_UNSAFE(). inline uint8_t getTwoByteLead(UChar32 c) { return (uint8_t)((c >> 6) | 0xc0); } inline uint8_t getTwoByteTrail(UChar32 c) { return (uint8_t)((c & 0x3f) | 0x80); } diff --git a/icuSources/common/ucasemap_imp.h b/icuSources/common/ucasemap_imp.h index e17a0ae..109e55e 100644 --- a/icuSources/common/ucasemap_imp.h +++ b/icuSources/common/ucasemap_imp.h @@ -7,9 +7,9 @@ #ifndef __UCASEMAP_IMP_H__ #define __UCASEMAP_IMP_H__ -#include "unicode/utypes.h" -#include "unicode/ucasemap.h" -#include "unicode/uchar.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/ucasemap.h> +#include <_foundation_unicode/uchar.h> #include "ucase.h" /** @@ -64,9 +64,9 @@ u_caseInsensitivePrefixMatch(const UChar *s1, int32_t length1, U_NAMESPACE_BEGIN -class BreakIterator; // unicode/brkiter.h +class BreakIterator; // _foundation_unicode/brkiter.h class ByteSink; -class Locale; // unicode/locid.h +class Locale; // _foundation_unicode/locid.h /** Returns true if the options are valid. Otherwise false, and sets an error. */ inline UBool ustrcase_checkTitleAdjustmentOptions(uint32_t options, UErrorCode &errorCode) { @@ -100,7 +100,7 @@ BreakIterator *ustrcase_getTitleBreakIterator( U_NAMESPACE_END -#include "unicode/unistr.h" // for UStringCaseMapper +#include <_foundation_unicode/unistr.h> // for UStringCaseMapper /* * Internal string casing functions implementing diff --git a/icuSources/common/ucasemap_titlecase_brkiter.cpp b/icuSources/common/ucasemap_titlecase_brkiter.cpp index c21dfb7..b84f8bb 100644 --- a/icuSources/common/ucasemap_titlecase_brkiter.cpp +++ b/icuSources/common/ucasemap_titlecase_brkiter.cpp @@ -17,14 +17,14 @@ * were moved here to break dependency cycles among parts of the common library. */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_BREAK_ITERATION -#include "unicode/brkiter.h" -#include "unicode/ubrk.h" -#include "unicode/casemap.h" -#include "unicode/ucasemap.h" +#include <_foundation_unicode/brkiter.h> +#include <_foundation_unicode/ubrk.h> +#include <_foundation_unicode/casemap.h> +#include <_foundation_unicode/ucasemap.h> #include "cmemory.h" #include "ucase.h" #include "ucasemap_imp.h" diff --git a/icuSources/common/ucat.cpp b/icuSources/common/ucat.cpp index dac56ee..3bd8530 100644 --- a/icuSources/common/ucat.cpp +++ b/icuSources/common/ucat.cpp @@ -10,8 +10,8 @@ * Since: ICU 2.6 ********************************************************************** */ -#include "unicode/ucat.h" -#include "unicode/ustring.h" +#include <_foundation_unicode/ucat.h> +#include <_foundation_unicode/ustring.h> #include "cstring.h" #include "uassert.h" diff --git a/icuSources/common/uchar.cpp b/icuSources/common/uchar.cpp index 7789a3b..0bef18b 100644 --- a/icuSources/common/uchar.cpp +++ b/icuSources/common/uchar.cpp @@ -21,10 +21,10 @@ ****************************************************************************** */ -#include "unicode/utypes.h" -#include "unicode/uchar.h" -#include "unicode/uscript.h" -#include "unicode/udata.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/uchar.h> +#include <_foundation_unicode/uscript.h> +#include <_foundation_unicode/udata.h> #include "uassert.h" #include "cmemory.h" #include "ucln_cmn.h" diff --git a/icuSources/common/ucharstrie.cpp b/icuSources/common/ucharstrie.cpp index 24ab425..d5fecd4 100644 --- a/icuSources/common/ucharstrie.cpp +++ b/icuSources/common/ucharstrie.cpp @@ -14,11 +14,11 @@ * created by: Markus W. Scherer */ -#include "unicode/utypes.h" -#include "unicode/appendable.h" -#include "unicode/ucharstrie.h" -#include "unicode/uobject.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/appendable.h> +#include <_foundation_unicode/ucharstrie.h> +#include <_foundation_unicode/uobject.h> +#include <_foundation_unicode/utf16.h> #include "cmemory.h" #include "uassert.h" diff --git a/icuSources/common/ucharstriebuilder.cpp b/icuSources/common/ucharstriebuilder.cpp index be32609..f41b6e8 100644 --- a/icuSources/common/ucharstriebuilder.cpp +++ b/icuSources/common/ucharstriebuilder.cpp @@ -14,11 +14,11 @@ * created by: Markus W. Scherer */ -#include "unicode/utypes.h" -#include "unicode/ucharstrie.h" -#include "unicode/ucharstriebuilder.h" -#include "unicode/unistr.h" -#include "unicode/ustring.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/ucharstrie.h> +#include <_foundation_unicode/ucharstriebuilder.h> +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/ustring.h> #include "cmemory.h" #include "uarrsort.h" #include "uassert.h" diff --git a/icuSources/common/ucharstrieiterator.cpp b/icuSources/common/ucharstrieiterator.cpp index 2ba4369..08c7e21 100644 --- a/icuSources/common/ucharstrieiterator.cpp +++ b/icuSources/common/ucharstrieiterator.cpp @@ -14,9 +14,9 @@ * created by: Markus W. Scherer */ -#include "unicode/utypes.h" -#include "unicode/ucharstrie.h" -#include "unicode/unistr.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/ucharstrie.h> +#include <_foundation_unicode/unistr.h> #include "uvectr32.h" U_NAMESPACE_BEGIN diff --git a/icuSources/common/uchriter.cpp b/icuSources/common/uchriter.cpp index f2a9953..cd85420 100644 --- a/icuSources/common/uchriter.cpp +++ b/icuSources/common/uchriter.cpp @@ -9,9 +9,9 @@ #include "utypeinfo.h" // for 'typeid' to work -#include "unicode/uchriter.h" -#include "unicode/ustring.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/uchriter.h> +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/utf16.h> #include "ustr_imp.h" U_NAMESPACE_BEGIN diff --git a/icuSources/common/ucln.h b/icuSources/common/ucln.h index fe6666e..35bfc1d 100644 --- a/icuSources/common/ucln.h +++ b/icuSources/common/ucln.h @@ -19,7 +19,7 @@ #ifndef __UCLN_H__ #define __UCLN_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> /** These are the functions used to register a library's memory cleanup * functions. Each library should define a single library register function diff --git a/icuSources/common/ucln_cmn.cpp b/icuSources/common/ucln_cmn.cpp index ea797d1..d31019a 100644 --- a/icuSources/common/ucln_cmn.cpp +++ b/icuSources/common/ucln_cmn.cpp @@ -14,8 +14,8 @@ * created by: George Rhoten */ -#include "unicode/utypes.h" -#include "unicode/uclean.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/uclean.h> #include "cmemory.h" #include "mutex.h" #include "uassert.h" diff --git a/icuSources/common/ucln_cmn.h b/icuSources/common/ucln_cmn.h index d048928..3c39b50 100644 --- a/icuSources/common/ucln_cmn.h +++ b/icuSources/common/ucln_cmn.h @@ -17,7 +17,7 @@ #ifndef __UCLN_CMN_H__ #define __UCLN_CMN_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #include "ucln.h" /* These are the cleanup functions for various APIs. */ diff --git a/icuSources/common/ucmndata.cpp b/icuSources/common/ucmndata.cpp index 4215d66..df64f1b 100644 --- a/icuSources/common/ucmndata.cpp +++ b/icuSources/common/ucmndata.cpp @@ -22,8 +22,8 @@ * */ -#include "unicode/utypes.h" -#include "unicode/udata.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/udata.h> #include "cstring.h" #include "ucmndata.h" #include "udatamem.h" diff --git a/icuSources/common/ucmndata.h b/icuSources/common/ucmndata.h index 486b4fd..8d97b64 100644 --- a/icuSources/common/ucmndata.h +++ b/icuSources/common/ucmndata.h @@ -27,7 +27,7 @@ #ifndef __UCMNDATA_H__ #define __UCMNDATA_H__ -#include "unicode/udata.h" +#include <_foundation_unicode/udata.h> #include "umapfile.h" diff --git a/icuSources/common/ucnv.cpp b/icuSources/common/ucnv.cpp index 26baa55..790bb4b 100644 --- a/icuSources/common/ucnv.cpp +++ b/icuSources/common/ucnv.cpp @@ -21,18 +21,18 @@ * 06/20/2000 helena OS/400 port changes; mostly typecast. */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_CONVERSION #include -#include "unicode/ustring.h" -#include "unicode/ucnv.h" -#include "unicode/ucnv_err.h" -#include "unicode/uset.h" -#include "unicode/utf.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/ucnv.h> +#include <_foundation_unicode/ucnv_err.h> +#include <_foundation_unicode/uset.h> +#include <_foundation_unicode/utf.h> +#include <_foundation_unicode/utf16.h> #include "putilimp.h" #include "cmemory.h" #include "cstring.h" diff --git a/icuSources/common/ucnv2022.cpp b/icuSources/common/ucnv2022.cpp index ec09678..0cee441 100644 --- a/icuSources/common/ucnv2022.cpp +++ b/icuSources/common/ucnv2022.cpp @@ -28,15 +28,15 @@ * 10/31/2000 Ram Implemented offsets logic functions */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_CONVERSION && !UCONFIG_NO_LEGACY_CONVERSION -#include "unicode/ucnv.h" -#include "unicode/uset.h" -#include "unicode/ucnv_err.h" -#include "unicode/ucnv_cb.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/ucnv.h> +#include <_foundation_unicode/uset.h> +#include <_foundation_unicode/ucnv_err.h> +#include <_foundation_unicode/ucnv_cb.h> +#include <_foundation_unicode/utf16.h> #include "ucnv_imp.h" #include "ucnv_bld.h" #include "ucnv_cnv.h" diff --git a/icuSources/common/ucnv_bld.cpp b/icuSources/common/ucnv_bld.cpp index a0fbfe2..43bd467 100644 --- a/icuSources/common/ucnv_bld.cpp +++ b/icuSources/common/ucnv_bld.cpp @@ -21,14 +21,14 @@ * 06/29/2000 helena Major rewrite of the callback interface. */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_CONVERSION -#include "unicode/putil.h" -#include "unicode/udata.h" -#include "unicode/ucnv.h" -#include "unicode/uloc.h" +#include <_foundation_unicode/putil.h> +#include <_foundation_unicode/udata.h> +#include <_foundation_unicode/ucnv.h> +#include <_foundation_unicode/uloc.h> #include "mutex.h" #include "putilimp.h" #include "uassert.h" diff --git a/icuSources/common/ucnv_bld.h b/icuSources/common/ucnv_bld.h index 43e6c09..6922be7 100644 --- a/icuSources/common/ucnv_bld.h +++ b/icuSources/common/ucnv_bld.h @@ -19,13 +19,13 @@ #ifndef UCNV_BLD_H #define UCNV_BLD_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_CONVERSION -#include "unicode/ucnv.h" -#include "unicode/ucnv_err.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/ucnv.h> +#include <_foundation_unicode/ucnv_err.h> +#include <_foundation_unicode/utf16.h> #include "ucnv_cnv.h" #include "ucnvmbcs.h" #include "ucnv_ext.h" diff --git a/icuSources/common/ucnv_cb.cpp b/icuSources/common/ucnv_cb.cpp index 7bfde82..bac4615 100644 --- a/icuSources/common/ucnv_cb.cpp +++ b/icuSources/common/ucnv_cb.cpp @@ -20,11 +20,11 @@ * */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_CONVERSION -#include "unicode/ucnv_cb.h" +#include <_foundation_unicode/ucnv_cb.h> #include "ucnv_bld.h" #include "ucnv_cnv.h" #include "cmemory.h" diff --git a/icuSources/common/ucnv_cnv.cpp b/icuSources/common/ucnv_cnv.cpp index ea71acf..83b7b88 100644 --- a/icuSources/common/ucnv_cnv.cpp +++ b/icuSources/common/ucnv_cnv.cpp @@ -17,13 +17,13 @@ * 06/29/2000 helena Major rewrite of the callback APIs. */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_CONVERSION -#include "unicode/ucnv_err.h" -#include "unicode/ucnv.h" -#include "unicode/uset.h" +#include <_foundation_unicode/ucnv_err.h> +#include <_foundation_unicode/ucnv.h> +#include <_foundation_unicode/uset.h> #include "ucnv_cnv.h" #include "ucnv_bld.h" #include "cmemory.h" diff --git a/icuSources/common/ucnv_cnv.h b/icuSources/common/ucnv_cnv.h index e89eebe..f8be87c 100644 --- a/icuSources/common/ucnv_cnv.h +++ b/icuSources/common/ucnv_cnv.h @@ -19,13 +19,13 @@ #ifndef UCNV_CNV_H #define UCNV_CNV_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_CONVERSION -#include "unicode/ucnv.h" -#include "unicode/ucnv_err.h" -#include "unicode/uset.h" +#include <_foundation_unicode/ucnv.h> +#include <_foundation_unicode/ucnv_err.h> +#include <_foundation_unicode/uset.h> #include "uset_imp.h" U_CDECL_BEGIN diff --git a/icuSources/common/ucnv_ct.cpp b/icuSources/common/ucnv_ct.cpp index c12e982..509ce31 100644 --- a/icuSources/common/ucnv_ct.cpp +++ b/icuSources/common/ucnv_ct.cpp @@ -14,15 +14,15 @@ * created by: Michael Ow */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_CONVERSION && !UCONFIG_NO_LEGACY_CONVERSION && !UCONFIG_ONLY_HTML_CONVERSION -#include "unicode/ucnv.h" -#include "unicode/uset.h" -#include "unicode/ucnv_err.h" -#include "unicode/ucnv_cb.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/ucnv.h> +#include <_foundation_unicode/uset.h> +#include <_foundation_unicode/ucnv_err.h> +#include <_foundation_unicode/ucnv_cb.h> +#include <_foundation_unicode/utf16.h> #include "ucnv_imp.h" #include "ucnv_bld.h" #include "ucnv_cnv.h" diff --git a/icuSources/common/ucnv_err.cpp b/icuSources/common/ucnv_err.cpp index 4210673..6402871 100644 --- a/icuSources/common/ucnv_err.cpp +++ b/icuSources/common/ucnv_err.cpp @@ -17,15 +17,15 @@ * 06/29/2000 helena Major rewrite of the callback APIs. */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_CONVERSION -#include "unicode/ucnv_err.h" -#include "unicode/ucnv_cb.h" +#include <_foundation_unicode/ucnv_err.h> +#include <_foundation_unicode/ucnv_cb.h> #include "ucnv_cnv.h" #include "cmemory.h" -#include "unicode/ucnv.h" +#include <_foundation_unicode/ucnv.h> #include "ustrfmt.h" #define VALUE_STRING_LENGTH 48 diff --git a/icuSources/common/ucnv_ext.cpp b/icuSources/common/ucnv_ext.cpp index ffc3c93..38c81ba 100644 --- a/icuSources/common/ucnv_ext.cpp +++ b/icuSources/common/ucnv_ext.cpp @@ -18,12 +18,12 @@ * Conversion extensions */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_CONVERSION && !UCONFIG_NO_LEGACY_CONVERSION -#include "unicode/uset.h" -#include "unicode/ustring.h" +#include <_foundation_unicode/uset.h> +#include <_foundation_unicode/ustring.h> #include "ucnv_bld.h" #include "ucnv_cnv.h" #include "ucnv_ext.h" diff --git a/icuSources/common/ucnv_ext.h b/icuSources/common/ucnv_ext.h index dceea7e..bc0da69 100644 --- a/icuSources/common/ucnv_ext.h +++ b/icuSources/common/ucnv_ext.h @@ -21,11 +21,11 @@ #ifndef __UCNV_EXT_H__ #define __UCNV_EXT_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_CONVERSION -#include "unicode/ucnv.h" +#include <_foundation_unicode/ucnv.h> #include "ucnv_cnv.h" /* diff --git a/icuSources/common/ucnv_imp.h b/icuSources/common/ucnv_imp.h index cb93991..9374728 100644 --- a/icuSources/common/ucnv_imp.h +++ b/icuSources/common/ucnv_imp.h @@ -22,11 +22,11 @@ #ifndef UCNV_IMP_H #define UCNV_IMP_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_CONVERSION -#include "unicode/uloc.h" +#include <_foundation_unicode/uloc.h> #include "ucnv_bld.h" /* diff --git a/icuSources/common/ucnv_io.cpp b/icuSources/common/ucnv_io.cpp index c9d20cb..5d2aa5a 100644 --- a/icuSources/common/ucnv_io.cpp +++ b/icuSources/common/ucnv_io.cpp @@ -29,12 +29,12 @@ ******************************************************************************* */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_CONVERSION -#include "unicode/ucnv.h" -#include "unicode/udata.h" +#include <_foundation_unicode/ucnv.h> +#include <_foundation_unicode/udata.h> #include "umutex.h" #include "uarrsort.h" diff --git a/icuSources/common/ucnv_io.h b/icuSources/common/ucnv_io.h index 8f2d7b5..bcaaf63 100644 --- a/icuSources/common/ucnv_io.h +++ b/icuSources/common/ucnv_io.h @@ -15,7 +15,7 @@ #ifndef UCNV_IO_H #define UCNV_IO_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_CONVERSION diff --git a/icuSources/common/ucnv_lmb.cpp b/icuSources/common/ucnv_lmb.cpp index 78b8e40..795374b 100644 --- a/icuSources/common/ucnv_lmb.cpp +++ b/icuSources/common/ucnv_lmb.cpp @@ -25,13 +25,13 @@ * 06/28/2000 helena Major rewrite for the callback API changes. */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_CONVERSION && !UCONFIG_NO_LEGACY_CONVERSION && !UCONFIG_ONLY_HTML_CONVERSION -#include "unicode/ucnv_err.h" -#include "unicode/ucnv.h" -#include "unicode/uset.h" +#include <_foundation_unicode/ucnv_err.h> +#include <_foundation_unicode/ucnv.h> +#include <_foundation_unicode/uset.h> #include "cmemory.h" #include "cstring.h" #include "uassert.h" diff --git a/icuSources/common/ucnv_set.cpp b/icuSources/common/ucnv_set.cpp index 926cee0..06324ee 100644 --- a/icuSources/common/ucnv_set.cpp +++ b/icuSources/common/ucnv_set.cpp @@ -20,9 +20,9 @@ * implementation functions on the USet implementation. */ -#include "unicode/utypes.h" -#include "unicode/uset.h" -#include "unicode/ucnv.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/uset.h> +#include <_foundation_unicode/ucnv.h> #include "ucnv_bld.h" #include "uset_imp.h" diff --git a/icuSources/common/ucnv_u16.cpp b/icuSources/common/ucnv_u16.cpp index bebdede..b7b5b66 100644 --- a/icuSources/common/ucnv_u16.cpp +++ b/icuSources/common/ucnv_u16.cpp @@ -16,12 +16,12 @@ * UTF-16 converter implementation. Used to be in ucnv_utf.c. */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_CONVERSION -#include "unicode/ucnv.h" -#include "unicode/uversion.h" +#include <_foundation_unicode/ucnv.h> +#include <_foundation_unicode/uversion.h> #include "ucnv_bld.h" #include "ucnv_cnv.h" #include "cmemory.h" diff --git a/icuSources/common/ucnv_u32.cpp b/icuSources/common/ucnv_u32.cpp index bc160b7..21258f3 100644 --- a/icuSources/common/ucnv_u32.cpp +++ b/icuSources/common/ucnv_u32.cpp @@ -16,12 +16,12 @@ * UTF-32 converter implementation. Used to be in ucnv_utf.c. */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_CONVERSION && !UCONFIG_ONLY_HTML_CONVERSION -#include "unicode/ucnv.h" -#include "unicode/utf.h" +#include <_foundation_unicode/ucnv.h> +#include <_foundation_unicode/utf.h> #include "ucnv_bld.h" #include "ucnv_cnv.h" #include "cmemory.h" diff --git a/icuSources/common/ucnv_u7.cpp b/icuSources/common/ucnv_u7.cpp index 8964ca0..e783baf 100644 --- a/icuSources/common/ucnv_u7.cpp +++ b/icuSources/common/ucnv_u7.cpp @@ -16,12 +16,12 @@ * UTF-7 converter implementation. Used to be in ucnv_utf.c. */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_CONVERSION && !UCONFIG_ONLY_HTML_CONVERSION #include "cmemory.h" -#include "unicode/ucnv.h" +#include <_foundation_unicode/ucnv.h> #include "ucnv_bld.h" #include "ucnv_cnv.h" #include "uassert.h" diff --git a/icuSources/common/ucnv_u8.cpp b/icuSources/common/ucnv_u8.cpp index 3c27f2e..175b72a 100644 --- a/icuSources/common/ucnv_u8.cpp +++ b/icuSources/common/ucnv_u8.cpp @@ -20,14 +20,14 @@ * UTF-8 converter, with a branch for converting supplementary code points. */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_CONVERSION -#include "unicode/ucnv.h" -#include "unicode/utf.h" -#include "unicode/utf8.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/ucnv.h> +#include <_foundation_unicode/utf.h> +#include <_foundation_unicode/utf8.h> +#include <_foundation_unicode/utf16.h> #include "uassert.h" #include "ucnv_bld.h" #include "ucnv_cnv.h" diff --git a/icuSources/common/ucnvbocu.cpp b/icuSources/common/ucnvbocu.cpp index edb49d3..6dfe9b9 100644 --- a/icuSources/common/ucnvbocu.cpp +++ b/icuSources/common/ucnvbocu.cpp @@ -19,13 +19,13 @@ * in its MIME-friendly form as defined in http://www.unicode.org/notes/tn6/ */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_CONVERSION && !UCONFIG_ONLY_HTML_CONVERSION -#include "unicode/ucnv.h" -#include "unicode/ucnv_cb.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/ucnv.h> +#include <_foundation_unicode/ucnv_cb.h> +#include <_foundation_unicode/utf16.h> #include "putilimp.h" #include "ucnv_bld.h" #include "ucnv_cnv.h" diff --git a/icuSources/common/ucnvdisp.cpp b/icuSources/common/ucnvdisp.cpp index ac86b98..bf0bbc4 100644 --- a/icuSources/common/ucnvdisp.cpp +++ b/icuSources/common/ucnvdisp.cpp @@ -20,13 +20,13 @@ * 09/08/2004 grhoten split from ucnv.c */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_CONVERSION -#include "unicode/ustring.h" -#include "unicode/ures.h" -#include "unicode/ucnv.h" +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/ures.h> +#include <_foundation_unicode/ucnv.h> #include "cstring.h" #include "ustr_imp.h" #include "ucnv_imp.h" diff --git a/icuSources/common/ucnvhz.cpp b/icuSources/common/ucnvhz.cpp index e0d2f07..ffa94ba 100644 --- a/icuSources/common/ucnvhz.cpp +++ b/icuSources/common/ucnvhz.cpp @@ -16,15 +16,15 @@ * */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_CONVERSION && !UCONFIG_NO_LEGACY_CONVERSION && !UCONFIG_ONLY_HTML_CONVERSION #include "cmemory.h" -#include "unicode/ucnv.h" -#include "unicode/ucnv_cb.h" -#include "unicode/uset.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/ucnv.h> +#include <_foundation_unicode/ucnv_cb.h> +#include <_foundation_unicode/uset.h> +#include <_foundation_unicode/utf16.h> #include "ucnv_bld.h" #include "ucnv_cnv.h" #include "ucnv_imp.h" diff --git a/icuSources/common/ucnvisci.cpp b/icuSources/common/ucnvisci.cpp index 4d747e1..b9d7835 100644 --- a/icuSources/common/ucnvisci.cpp +++ b/icuSources/common/ucnvisci.cpp @@ -17,13 +17,13 @@ * 24/7/2001 Ram Added support for EXT character handling */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_CONVERSION && !UCONFIG_NO_LEGACY_CONVERSION && !UCONFIG_ONLY_HTML_CONVERSION -#include "unicode/ucnv.h" -#include "unicode/ucnv_cb.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/ucnv.h> +#include <_foundation_unicode/ucnv_cb.h> +#include <_foundation_unicode/utf16.h> #include "cmemory.h" #include "ucnv_bld.h" #include "ucnv_cnv.h" diff --git a/icuSources/common/ucnvlat1.cpp b/icuSources/common/ucnvlat1.cpp index 05aad6a..e429d5e 100644 --- a/icuSources/common/ucnvlat1.cpp +++ b/icuSources/common/ucnvlat1.cpp @@ -14,13 +14,13 @@ * created by: Markus W. Scherer */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_CONVERSION -#include "unicode/ucnv.h" -#include "unicode/uset.h" -#include "unicode/utf8.h" +#include <_foundation_unicode/ucnv.h> +#include <_foundation_unicode/uset.h> +#include <_foundation_unicode/utf8.h> #include "ucnv_bld.h" #include "ucnv_cnv.h" #include "ustr_imp.h" diff --git a/icuSources/common/ucnvmbcs.cpp b/icuSources/common/ucnvmbcs.cpp index 0ed3807..6617b2c 100644 --- a/icuSources/common/ucnvmbcs.cpp +++ b/icuSources/common/ucnvmbcs.cpp @@ -42,16 +42,16 @@ * macros to ucnvmbcs.h file */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_CONVERSION && !UCONFIG_NO_LEGACY_CONVERSION -#include "unicode/ucnv.h" -#include "unicode/ucnv_cb.h" -#include "unicode/udata.h" -#include "unicode/uset.h" -#include "unicode/utf8.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/ucnv.h> +#include <_foundation_unicode/ucnv_cb.h> +#include <_foundation_unicode/udata.h> +#include <_foundation_unicode/uset.h> +#include <_foundation_unicode/utf8.h> +#include <_foundation_unicode/utf16.h> #include "ucnv_bld.h" #include "ucnvmbcs.h" #include "ucnv_ext.h" diff --git a/icuSources/common/ucnvmbcs.h b/icuSources/common/ucnvmbcs.h index c8f3b89..9174b4b 100644 --- a/icuSources/common/ucnvmbcs.h +++ b/icuSources/common/ucnvmbcs.h @@ -19,11 +19,11 @@ #ifndef __UCNVMBCS_H__ #define __UCNVMBCS_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_CONVERSION -#include "unicode/ucnv.h" +#include <_foundation_unicode/ucnv.h> #include "ucnv_cnv.h" #include "ucnv_ext.h" diff --git a/icuSources/common/ucnvscsu.cpp b/icuSources/common/ucnvscsu.cpp index 86e850a..128470d 100644 --- a/icuSources/common/ucnvscsu.cpp +++ b/icuSources/common/ucnvscsu.cpp @@ -21,13 +21,13 @@ * will result in callback calls. */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_CONVERSION && !UCONFIG_ONLY_HTML_CONVERSION -#include "unicode/ucnv.h" -#include "unicode/ucnv_cb.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/ucnv.h> +#include <_foundation_unicode/ucnv_cb.h> +#include <_foundation_unicode/utf16.h> #include "ucnv_bld.h" #include "ucnv_cnv.h" #include "cmemory.h" diff --git a/icuSources/common/ucnvsel.cpp b/icuSources/common/ucnvsel.cpp index 15ee596..73a888e 100644 --- a/icuSources/common/ucnvsel.cpp +++ b/icuSources/common/ucnvsel.cpp @@ -26,17 +26,17 @@ * stores all encodings a codepoint can map to */ -#include "unicode/ucnvsel.h" +#include <_foundation_unicode/ucnvsel.h> #if !UCONFIG_NO_CONVERSION #include -#include "unicode/uchar.h" -#include "unicode/uniset.h" -#include "unicode/ucnv.h" -#include "unicode/ustring.h" -#include "unicode/uchriter.h" +#include <_foundation_unicode/uchar.h> +#include <_foundation_unicode/uniset.h> +#include <_foundation_unicode/ucnv.h> +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/uchriter.h> #include "utrie2.h" #include "propsvec.h" #include "uassert.h" diff --git a/icuSources/common/ucol_data.h b/icuSources/common/ucol_data.h index 83f54ab..62b4935 100644 --- a/icuSources/common/ucol_data.h +++ b/icuSources/common/ucol_data.h @@ -26,7 +26,7 @@ #ifndef __UCOL_DATA_H__ #define __UCOL_DATA_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_COLLATION diff --git a/icuSources/common/ucol_swp.cpp b/icuSources/common/ucol_swp.cpp index 59704ff..6c341e0 100644 --- a/icuSources/common/ucol_swp.cpp +++ b/icuSources/common/ucol_swp.cpp @@ -18,7 +18,7 @@ * Swap collation binaries. */ -#include "unicode/udata.h" /* UDataInfo */ +#include <_foundation_unicode/udata.h> /* UDataInfo */ #include "utrie.h" #include "utrie2.h" #include "udataswp.h" diff --git a/icuSources/common/ucol_swp.h b/icuSources/common/ucol_swp.h index 0c2990a..3842dfd 100644 --- a/icuSources/common/ucol_swp.h +++ b/icuSources/common/ucol_swp.h @@ -21,7 +21,7 @@ #ifndef __UCOL_SWP_H__ #define __UCOL_SWP_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_COLLATION diff --git a/icuSources/common/ucptrie.cpp b/icuSources/common/ucptrie.cpp index 0004160..13c82c1 100644 --- a/icuSources/common/ucptrie.cpp +++ b/icuSources/common/ucptrie.cpp @@ -9,11 +9,11 @@ # include #endif -#include "unicode/utypes.h" -#include "unicode/ucptrie.h" -#include "unicode/utf.h" -#include "unicode/utf8.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/ucptrie.h> +#include <_foundation_unicode/utf.h> +#include <_foundation_unicode/utf8.h> +#include <_foundation_unicode/utf16.h> #include "cmemory.h" #include "uassert.h" #include "ucptrie_impl.h" diff --git a/icuSources/common/ucptrie_impl.h b/icuSources/common/ucptrie_impl.h index a7a80a8..cc45c21 100644 --- a/icuSources/common/ucptrie_impl.h +++ b/icuSources/common/ucptrie_impl.h @@ -7,9 +7,9 @@ #ifndef __UCPTRIE_IMPL_H__ #define __UCPTRIE_IMPL_H__ -#include "unicode/ucptrie.h" +#include <_foundation_unicode/ucptrie.h> #ifdef UCPTRIE_DEBUG -#include "unicode/umutablecptrie.h" +#include <_foundation_unicode/umutablecptrie.h> #endif // UCPTrie signature values, in platform endianness and opposite endianness. diff --git a/icuSources/common/ucurr.cpp b/icuSources/common/ucurr.cpp index d74baf6..18397f9 100644 --- a/icuSources/common/ucurr.cpp +++ b/icuSources/common/ucurr.cpp @@ -7,22 +7,22 @@ ********************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/ucurr.h" -#include "unicode/locid.h" -#include "unicode/ures.h" -#include "unicode/ustring.h" -#include "unicode/parsepos.h" -#include "unicode/uniset.h" +#include <_foundation_unicode/ucurr.h> +#include <_foundation_unicode/locid.h> +#include <_foundation_unicode/ures.h> +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/parsepos.h> +#include <_foundation_unicode/uniset.h> #if APPLE_ICU_CHANGES // rdar://77347002 #222 (iOS: Sky: English/SA: Currency placement is incorrect in system and settings example.) -#include "unicode/uscript.h" +#include <_foundation_unicode/uscript.h> #endif // APPLE_ICU_CHANGES -#include "unicode/usetiter.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/usetiter.h> +#include <_foundation_unicode/utf16.h> #include "ustr_imp.h" #include "charstr.h" #include "cmemory.h" diff --git a/icuSources/common/ucurrimp.h b/icuSources/common/ucurrimp.h index 6d95882..33862f4 100644 --- a/icuSources/common/ucurrimp.h +++ b/icuSources/common/ucurrimp.h @@ -10,10 +10,10 @@ #ifndef _UCURR_IMP_H_ #define _UCURR_IMP_H_ -#include "unicode/utypes.h" -#include "unicode/unistr.h" -#include "unicode/parsepos.h" -#include "unicode/uniset.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/parsepos.h> +#include <_foundation_unicode/uniset.h> /** * Internal method. Given a currency ISO code and a locale, return diff --git a/icuSources/common/udata.cpp b/icuSources/common/udata.cpp index c89c52a..6f8489f 100644 --- a/icuSources/common/udata.cpp +++ b/icuSources/common/udata.cpp @@ -16,7 +16,7 @@ * created by: Markus W. Scherer */ -#include "unicode/utypes.h" /* U_PLATFORM etc. */ +#include <_foundation_unicode/utypes.h> /* U_PLATFORM etc. */ #ifdef __GNUC__ /* if gcc @@ -25,9 +25,9 @@ might have to #include some other header */ #endif -#include "unicode/putil.h" -#include "unicode/udata.h" -#include "unicode/uversion.h" +#include <_foundation_unicode/putil.h> +#include <_foundation_unicode/udata.h> +#include <_foundation_unicode/uversion.h> #include "charstr.h" #include "cmemory.h" #include "cstring.h" @@ -1149,16 +1149,6 @@ static UBool isTimeZoneFile(const char *name, const char *type) { uprv_strcmp(name, "metaZones") == 0)); } - -#if defined(USE_PACKAGE_DATA) -// Point commonData to the packaged data -static void U_CALLCONV packagedDataPointerInitFn() { - udata_setFileAccess(UDATA_PACKAGES_FIRST, NULL); - UErrorCode error = U_ZERO_ERROR; - udata_setCommonData(&_ICUPackagedMainData, &error); -} -#endif // defined(USE_PACKAGE_DATA) - /* * A note on the ownership of Mapped Memory * @@ -1196,13 +1186,6 @@ doOpenChoice(const char *path, const char *type, const char *name, UDataMemoryIsAcceptable *isAcceptable, void *context, UErrorCode *pErrorCode) { -#if defined(USE_PACKAGE_DATA) - // Conventionally this method should be called at an app's main - // Since SwiftFoundationICU doesn't have a main, initialize the - // data pointers once when doOpenChoice is first called. - umtx_initOnce(gCommonICUDataInitOnce, &packagedDataPointerInitFn); -#endif - UDataMemory *retVal = NULL; const char *dataPath; diff --git a/icuSources/common/udatamem.cpp b/icuSources/common/udatamem.cpp index 0f80de2..ea737ce 100644 --- a/icuSources/common/udatamem.cpp +++ b/icuSources/common/udatamem.cpp @@ -19,9 +19,9 @@ * *----------------------------------------------------------------------------------*/ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #include "cmemory.h" -#include "unicode/udata.h" +#include <_foundation_unicode/udata.h> #include "udatamem.h" diff --git a/icuSources/common/udatamem.h b/icuSources/common/udatamem.h index 3db2af4..6b92c0f 100644 --- a/icuSources/common/udatamem.h +++ b/icuSources/common/udatamem.h @@ -21,7 +21,7 @@ #ifndef __UDATAMEM_H__ #define __UDATAMEM_H__ -#include "unicode/udata.h" +#include <_foundation_unicode/udata.h> #include "ucmndata.h" struct UDataMemory { diff --git a/icuSources/common/udataswp.cpp b/icuSources/common/udataswp.cpp index 86f302b..f7edbab 100644 --- a/icuSources/common/udataswp.cpp +++ b/icuSources/common/udataswp.cpp @@ -21,8 +21,8 @@ */ #include -#include "unicode/utypes.h" -#include "unicode/udata.h" /* UDataInfo */ +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/udata.h> /* UDataInfo */ #include "ucmndata.h" /* DataHeader */ #include "cmemory.h" #include "udataswp.h" diff --git a/icuSources/common/udataswp.h b/icuSources/common/udataswp.h index 5e7b043..23fe1d9 100644 --- a/icuSources/common/udataswp.h +++ b/icuSources/common/udataswp.h @@ -24,7 +24,7 @@ #define __UDATASWP_H__ #include -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> /* forward declaration */ diff --git a/icuSources/common/uelement.h b/icuSources/common/uelement.h index 2c5a204..a8b9be1 100644 --- a/icuSources/common/uelement.h +++ b/icuSources/common/uelement.h @@ -23,7 +23,7 @@ #ifndef __UELEMENT_H__ #define __UELEMENT_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> U_CDECL_BEGIN diff --git a/icuSources/common/uenum.cpp b/icuSources/common/uenum.cpp index 11d895e..de49ca5 100644 --- a/icuSources/common/uenum.cpp +++ b/icuSources/common/uenum.cpp @@ -16,7 +16,7 @@ * created by: Vladimir Weinstein */ -#include "unicode/putil.h" +#include <_foundation_unicode/putil.h> #include "uenumimp.h" #include "cmemory.h" diff --git a/icuSources/common/uenumimp.h b/icuSources/common/uenumimp.h index 9c9df75..0327e8f 100644 --- a/icuSources/common/uenumimp.h +++ b/icuSources/common/uenumimp.h @@ -19,7 +19,7 @@ #ifndef __UENUMIMP_H #define __UENUMIMP_H -#include "unicode/uenum.h" +#include <_foundation_unicode/uenum.h> U_CDECL_BEGIN diff --git a/icuSources/common/uhash.cpp b/icuSources/common/uhash.cpp index a04f960..23a25bf 100644 --- a/icuSources/common/uhash.cpp +++ b/icuSources/common/uhash.cpp @@ -13,7 +13,7 @@ */ #include "uhash.h" -#include "unicode/ustring.h" +#include <_foundation_unicode/ustring.h> #include "cstring.h" #include "cmemory.h" #include "uassert.h" diff --git a/icuSources/common/uhash.h b/icuSources/common/uhash.h index 2ce296f..0997f4a 100644 --- a/icuSources/common/uhash.h +++ b/icuSources/common/uhash.h @@ -15,10 +15,10 @@ #ifndef UHASH_H #define UHASH_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #include "cmemory.h" #include "uelement.h" -#include "unicode/localpointer.h" +#include <_foundation_unicode/localpointer.h> /** * UHashtable stores key-value pairs and does moderately fast lookup diff --git a/icuSources/common/uidna.cpp b/icuSources/common/uidna.cpp index 1cbdeec..3f915e6 100644 --- a/icuSources/common/uidna.cpp +++ b/icuSources/common/uidna.cpp @@ -16,13 +16,13 @@ * created by: Ram Viswanadha */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_IDNA -#include "unicode/uidna.h" -#include "unicode/ustring.h" -#include "unicode/usprep.h" +#include <_foundation_unicode/uidna.h> +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/usprep.h> #include "punycode.h" #include "ustr_imp.h" #include "cmemory.h" diff --git a/icuSources/common/uinit.cpp b/icuSources/common/uinit.cpp index dc3867b..1a22864 100644 --- a/icuSources/common/uinit.cpp +++ b/icuSources/common/uinit.cpp @@ -14,9 +14,9 @@ * created by: George Rhoten */ -#include "unicode/utypes.h" -#include "unicode/icuplug.h" -#include "unicode/uclean.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/icuplug.h> +#include <_foundation_unicode/uclean.h> #include "cmemory.h" #include "icuplugimp.h" #include "ucln_cmn.h" diff --git a/icuSources/common/uinvchar.cpp b/icuSources/common/uinvchar.cpp index ffce3ec..b52864c 100644 --- a/icuSources/common/uinvchar.cpp +++ b/icuSources/common/uinvchar.cpp @@ -19,8 +19,8 @@ * for better modularization. */ -#include "unicode/utypes.h" -#include "unicode/ustring.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/ustring.h> #include "udataswp.h" #include "cstring.h" #include "cmemory.h" diff --git a/icuSources/common/uinvchar.h b/icuSources/common/uinvchar.h index 9b7a9bd..76186bc 100644 --- a/icuSources/common/uinvchar.h +++ b/icuSources/common/uinvchar.h @@ -22,9 +22,9 @@ #ifndef __UINVCHAR_H__ #define __UINVCHAR_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #ifdef __cplusplus -#include "unicode/unistr.h" +#include <_foundation_unicode/unistr.h> #endif /** diff --git a/icuSources/common/uiter.cpp b/icuSources/common/uiter.cpp index c4ab7d6..d0819d1 100644 --- a/icuSources/common/uiter.cpp +++ b/icuSources/common/uiter.cpp @@ -16,14 +16,14 @@ * created by: Markus W. Scherer */ -#include "unicode/utypes.h" -#include "unicode/ustring.h" -#include "unicode/chariter.h" -#include "unicode/rep.h" -#include "unicode/uiter.h" -#include "unicode/utf.h" -#include "unicode/utf8.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/chariter.h> +#include <_foundation_unicode/rep.h> +#include <_foundation_unicode/uiter.h> +#include <_foundation_unicode/utf.h> +#include <_foundation_unicode/utf8.h> +#include <_foundation_unicode/utf16.h> #include "cstring.h" U_NAMESPACE_USE diff --git a/icuSources/common/ulayout_props.h b/icuSources/common/ulayout_props.h index c0f028c..9a3d929 100644 --- a/icuSources/common/ulayout_props.h +++ b/icuSources/common/ulayout_props.h @@ -7,7 +7,7 @@ #ifndef __ULAYOUT_PROPS_H__ #define __ULAYOUT_PROPS_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> // file definitions ------------------------------------------------------------ diff --git a/icuSources/common/ulist.h b/icuSources/common/ulist.h index de58a4a..2ebe8a1 100644 --- a/icuSources/common/ulist.h +++ b/icuSources/common/ulist.h @@ -10,8 +10,8 @@ #ifndef ULIST_H #define ULIST_H -#include "unicode/utypes.h" -#include "unicode/uenum.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/uenum.h> struct UList; typedef struct UList UList; diff --git a/icuSources/common/uloc.cpp b/icuSources/common/uloc.cpp index b61989b..88e1262 100644 --- a/icuSources/common/uloc.cpp +++ b/icuSources/common/uloc.cpp @@ -30,15 +30,15 @@ l = lang, C = ctry, M = charmap, V = variant */ -#include "unicode/bytestream.h" -#include "unicode/errorcode.h" -#include "unicode/stringpiece.h" -#include "unicode/utypes.h" -#include "unicode/ustring.h" -#include "unicode/uloc.h" +#include <_foundation_unicode/bytestream.h> +#include <_foundation_unicode/errorcode.h> +#include <_foundation_unicode/stringpiece.h> +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/uloc.h> #if APPLE_ICU_CHANGES // rdar://74314220 #189 Add ualoc_canonicalForm, C wrapper for Locale::createCanonical -#include "unicode/locid.h" +#include <_foundation_unicode/locid.h> #endif // APPLE_ICU_CHANGES #include "bytesinkutil.h" diff --git a/icuSources/common/uloc_keytype.cpp b/icuSources/common/uloc_keytype.cpp index 12dc300..020358a 100644 --- a/icuSources/common/uloc_keytype.cpp +++ b/icuSources/common/uloc_keytype.cpp @@ -8,9 +8,9 @@ */ #include -#include "unicode/utypes.h" -#include "unicode/unistr.h" -#include "unicode/uobject.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/uobject.h> #include "charstr.h" #include "cmemory.h" diff --git a/icuSources/common/uloc_tag.cpp b/icuSources/common/uloc_tag.cpp index 01a0e00..0466599 100644 --- a/icuSources/common/uloc_tag.cpp +++ b/icuSources/common/uloc_tag.cpp @@ -7,13 +7,13 @@ ********************************************************************** */ -#include "unicode/bytestream.h" -#include "unicode/utypes.h" -#include "unicode/ures.h" -#include "unicode/localpointer.h" -#include "unicode/putil.h" -#include "unicode/uenum.h" -#include "unicode/uloc.h" +#include <_foundation_unicode/bytestream.h> +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/ures.h> +#include <_foundation_unicode/localpointer.h> +#include <_foundation_unicode/putil.h> +#include <_foundation_unicode/uenum.h> +#include <_foundation_unicode/uloc.h> #include "ustr_imp.h" #include "bytesinkutil.h" #include "charstr.h" diff --git a/icuSources/common/ulocdata.cpp b/icuSources/common/ulocdata.cpp index 48efe9d..686b107 100644 --- a/icuSources/common/ulocdata.cpp +++ b/icuSources/common/ulocdata.cpp @@ -17,10 +17,10 @@ */ #include "cmemory.h" -#include "unicode/ustring.h" -#include "unicode/ures.h" -#include "unicode/uloc.h" -#include "unicode/ulocdata.h" +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/ures.h> +#include <_foundation_unicode/uloc.h> +#include <_foundation_unicode/ulocdata.h> #include "uresimp.h" #include "ureslocs.h" #include "ulocimp.h" diff --git a/icuSources/common/ulocimp.h b/icuSources/common/ulocimp.h index 749243a..3476a6d 100644 --- a/icuSources/common/ulocimp.h +++ b/icuSources/common/ulocimp.h @@ -10,8 +10,8 @@ #ifndef ULOCIMP_H #define ULOCIMP_H -#include "unicode/bytestream.h" -#include "unicode/uloc.h" +#include <_foundation_unicode/bytestream.h> +#include <_foundation_unicode/uloc.h> #include "charstr.h" diff --git a/icuSources/common/umapfile.cpp b/icuSources/common/umapfile.cpp index 145582e..94b4b4e 100644 --- a/icuSources/common/umapfile.cpp +++ b/icuSources/common/umapfile.cpp @@ -21,8 +21,8 @@ * Must be before any other #includes. */ #include "uposixdefs.h" -#include "unicode/putil.h" -#include "unicode/ustring.h" +#include <_foundation_unicode/putil.h> +#include <_foundation_unicode/ustring.h> #include "udatamem.h" #include "umapfile.h" @@ -82,7 +82,7 @@ typedef HANDLE MemoryMap; # include # include "cstring.h" # include "cmemory.h" -# include "unicode/udata.h" +# include "_foundation_unicode/udata.h" # define LIB_PREFIX "lib" # define LIB_SUFFIX ".dll" /* This is inconvenient until we figure out what to do with U_ICUDATA_NAME in utypes.h */ diff --git a/icuSources/common/umapfile.h b/icuSources/common/umapfile.h index 042e713..cf5ab0c 100644 --- a/icuSources/common/umapfile.h +++ b/icuSources/common/umapfile.h @@ -25,8 +25,8 @@ #ifndef __UMAPFILE_H__ #define __UMAPFILE_H__ -#include "unicode/putil.h" -#include "unicode/udata.h" +#include <_foundation_unicode/putil.h> +#include <_foundation_unicode/udata.h> #include "putilimp.h" U_CAPI UBool U_EXPORT2 uprv_mapFile(UDataMemory *pdm, const char *path, UErrorCode *status); diff --git a/icuSources/common/umutablecptrie.cpp b/icuSources/common/umutablecptrie.cpp index cdbe270..fe3a9f5 100644 --- a/icuSources/common/umutablecptrie.cpp +++ b/icuSources/common/umutablecptrie.cpp @@ -9,11 +9,11 @@ # include #endif -#include "unicode/utypes.h" -#include "unicode/ucptrie.h" -#include "unicode/umutablecptrie.h" -#include "unicode/uobject.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/ucptrie.h> +#include <_foundation_unicode/umutablecptrie.h> +#include <_foundation_unicode/uobject.h> +#include <_foundation_unicode/utf16.h> #include "cmemory.h" #include "uassert.h" #include "ucptrie_impl.h" diff --git a/icuSources/common/umutex.cpp b/icuSources/common/umutex.cpp index ccbee99..26d2d7e 100644 --- a/icuSources/common/umutex.cpp +++ b/icuSources/common/umutex.cpp @@ -22,7 +22,7 @@ #include "umutex.h" -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #include "uassert.h" #include "ucln_cmn.h" #include "cmemory.h" diff --git a/icuSources/common/umutex.h b/icuSources/common/umutex.h index 1b83324..731e77c 100644 --- a/icuSources/common/umutex.h +++ b/icuSources/common/umutex.h @@ -25,9 +25,9 @@ #include #include -#include "unicode/utypes.h" -#include "unicode/uclean.h" -#include "unicode/uobject.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/uclean.h> +#include <_foundation_unicode/uobject.h> #include "putilimp.h" diff --git a/icuSources/common/unames.cpp b/icuSources/common/unames.cpp index b0ac991..d818995 100644 --- a/icuSources/common/unames.cpp +++ b/icuSources/common/unames.cpp @@ -16,12 +16,12 @@ * created by: Markus W. Scherer */ -#include "unicode/utypes.h" -#include "unicode/putil.h" -#include "unicode/uchar.h" -#include "unicode/udata.h" -#include "unicode/utf.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/putil.h> +#include <_foundation_unicode/uchar.h> +#include <_foundation_unicode/udata.h> +#include <_foundation_unicode/utf.h> +#include <_foundation_unicode/utf16.h> #include "uassert.h" #include "ustr_imp.h" #include "umutex.h" diff --git a/icuSources/common/unifiedcache.h b/icuSources/common/unifiedcache.h index 4b92221..d9231ee 100644 --- a/icuSources/common/unifiedcache.h +++ b/icuSources/common/unifiedcache.h @@ -15,10 +15,10 @@ #include "utypeinfo.h" // for 'typeid' to work -#include "unicode/uobject.h" -#include "unicode/locid.h" +#include <_foundation_unicode/uobject.h> +#include <_foundation_unicode/locid.h> #include "sharedobject.h" -#include "unicode/unistr.h" +#include <_foundation_unicode/unistr.h> #include "cstring.h" #include "ustr_imp.h" diff --git a/icuSources/common/unifilt.cpp b/icuSources/common/unifilt.cpp index 4ab0d9b..4b7089b 100644 --- a/icuSources/common/unifilt.cpp +++ b/icuSources/common/unifilt.cpp @@ -10,9 +10,9 @@ ********************************************************************** */ -#include "unicode/unifilt.h" -#include "unicode/rep.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/unifilt.h> +#include <_foundation_unicode/rep.h> +#include <_foundation_unicode/utf16.h> U_NAMESPACE_BEGIN UOBJECT_DEFINE_ABSTRACT_RTTI_IMPLEMENTATION(UnicodeFilter) diff --git a/icuSources/common/unifunct.cpp b/icuSources/common/unifunct.cpp index f3995b2..c569a7d 100644 --- a/icuSources/common/unifunct.cpp +++ b/icuSources/common/unifunct.cpp @@ -7,7 +7,7 @@ ********************************************************************** */ -#include "unicode/unifunct.h" +#include <_foundation_unicode/unifunct.h> U_NAMESPACE_BEGIN diff --git a/icuSources/common/uniset.cpp b/icuSources/common/uniset.cpp index ff0dced..8d28de6 100644 --- a/icuSources/common/uniset.cpp +++ b/icuSources/common/uniset.cpp @@ -10,13 +10,13 @@ ********************************************************************** */ -#include "unicode/utypes.h" -#include "unicode/parsepos.h" -#include "unicode/symtable.h" -#include "unicode/uniset.h" -#include "unicode/ustring.h" -#include "unicode/utf8.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/parsepos.h> +#include <_foundation_unicode/symtable.h> +#include <_foundation_unicode/uniset.h> +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/utf8.h> +#include <_foundation_unicode/utf16.h> #include "ruleiter.h" #include "cmemory.h" #include "cstring.h" diff --git a/icuSources/common/uniset_closure.cpp b/icuSources/common/uniset_closure.cpp index d7dab2a..99b47b7 100644 --- a/icuSources/common/uniset_closure.cpp +++ b/icuSources/common/uniset_closure.cpp @@ -21,10 +21,10 @@ * code also builds UnicodeSets from patterns and needs uniset_props. */ -#include "unicode/brkiter.h" -#include "unicode/locid.h" -#include "unicode/parsepos.h" -#include "unicode/uniset.h" +#include <_foundation_unicode/brkiter.h> +#include <_foundation_unicode/locid.h> +#include <_foundation_unicode/parsepos.h> +#include <_foundation_unicode/uniset.h> #include "cmemory.h" #include "ruleiter.h" #include "ucase.h" diff --git a/icuSources/common/uniset_props.cpp b/icuSources/common/uniset_props.cpp index 48c0a26..40888d0 100644 --- a/icuSources/common/uniset_props.cpp +++ b/icuSources/common/uniset_props.cpp @@ -18,15 +18,15 @@ * Character property dependent functions moved here from uniset.cpp */ -#include "unicode/utypes.h" -#include "unicode/uniset.h" -#include "unicode/parsepos.h" -#include "unicode/uchar.h" -#include "unicode/uscript.h" -#include "unicode/symtable.h" -#include "unicode/uset.h" -#include "unicode/locid.h" -#include "unicode/brkiter.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/uniset.h> +#include <_foundation_unicode/parsepos.h> +#include <_foundation_unicode/uchar.h> +#include <_foundation_unicode/uscript.h> +#include <_foundation_unicode/symtable.h> +#include <_foundation_unicode/uset.h> +#include <_foundation_unicode/locid.h> +#include <_foundation_unicode/brkiter.h> #include "uset_imp.h" #include "ruleiter.h" #include "cmemory.h" diff --git a/icuSources/common/unisetspan.cpp b/icuSources/common/unisetspan.cpp index e4277c5..296a1b4 100644 --- a/icuSources/common/unisetspan.cpp +++ b/icuSources/common/unisetspan.cpp @@ -16,11 +16,11 @@ * created by: Markus W. Scherer */ -#include "unicode/utypes.h" -#include "unicode/uniset.h" -#include "unicode/ustring.h" -#include "unicode/utf8.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/uniset.h> +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/utf8.h> +#include <_foundation_unicode/utf16.h> #include "cmemory.h" #include "uvector.h" #include "unisetspan.h" diff --git a/icuSources/common/unisetspan.h b/icuSources/common/unisetspan.h index 9a1307a..b960b57 100644 --- a/icuSources/common/unisetspan.h +++ b/icuSources/common/unisetspan.h @@ -19,8 +19,8 @@ #ifndef __UNISETSPAN_H__ #define __UNISETSPAN_H__ -#include "unicode/utypes.h" -#include "unicode/uniset.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/uniset.h> U_NAMESPACE_BEGIN diff --git a/icuSources/common/unistr.cpp b/icuSources/common/unistr.cpp index 4125d19..a514148 100644 --- a/icuSources/common/unistr.cpp +++ b/icuSources/common/unistr.cpp @@ -20,15 +20,15 @@ ****************************************************************************** */ -#include "unicode/utypes.h" -#include "unicode/appendable.h" -#include "unicode/putil.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/appendable.h> +#include <_foundation_unicode/putil.h> #include "cstring.h" #include "cmemory.h" -#include "unicode/ustring.h" -#include "unicode/unistr.h" -#include "unicode/utf.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/utf.h> +#include <_foundation_unicode/utf16.h> #include "uelement.h" #include "ustr_imp.h" #include "umutex.h" diff --git a/icuSources/common/unistr_case.cpp b/icuSources/common/unistr_case.cpp index f4c43b4..fac948c 100644 --- a/icuSources/common/unistr_case.cpp +++ b/icuSources/common/unistr_case.cpp @@ -18,16 +18,16 @@ * Case-mapping functions moved here from unistr.cpp */ -#include "unicode/utypes.h" -#include "unicode/brkiter.h" -#include "unicode/casemap.h" -#include "unicode/edits.h" -#include "unicode/putil.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/brkiter.h> +#include <_foundation_unicode/casemap.h> +#include <_foundation_unicode/edits.h> +#include <_foundation_unicode/putil.h> #include "cstring.h" #include "cmemory.h" -#include "unicode/ustring.h" -#include "unicode/unistr.h" -#include "unicode/uchar.h" +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/uchar.h> #include "uassert.h" #include "ucasemap_imp.h" #include "uelement.h" diff --git a/icuSources/common/unistr_case_locale.cpp b/icuSources/common/unistr_case_locale.cpp index f0f3048..e913861 100644 --- a/icuSources/common/unistr_case_locale.cpp +++ b/icuSources/common/unistr_case_locale.cpp @@ -17,10 +17,10 @@ * were moved here to break dependency cycles among parts of the common library. */ -#include "unicode/utypes.h" -#include "unicode/locid.h" -#include "unicode/ucasemap.h" -#include "unicode/unistr.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/locid.h> +#include <_foundation_unicode/ucasemap.h> +#include <_foundation_unicode/unistr.h> #include "ucasemap_imp.h" U_NAMESPACE_BEGIN diff --git a/icuSources/common/unistr_cnv.cpp b/icuSources/common/unistr_cnv.cpp index e1f60d4..b3f3ee1 100644 --- a/icuSources/common/unistr_cnv.cpp +++ b/icuSources/common/unistr_cnv.cpp @@ -18,16 +18,16 @@ * Character conversion functions moved here from unistr.cpp */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_CONVERSION -#include "unicode/putil.h" +#include <_foundation_unicode/putil.h> #include "cstring.h" #include "cmemory.h" -#include "unicode/ustring.h" -#include "unicode/unistr.h" -#include "unicode/ucnv.h" +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/ucnv.h> #include "ucnv_imp.h" #include "putilimp.h" #include "ustr_cnv.h" diff --git a/icuSources/common/unistr_props.cpp b/icuSources/common/unistr_props.cpp index 4006475..a61e8ec 100644 --- a/icuSources/common/unistr_props.cpp +++ b/icuSources/common/unistr_props.cpp @@ -18,10 +18,10 @@ * Character property dependent functions moved here from unistr.cpp */ -#include "unicode/utypes.h" -#include "unicode/uchar.h" -#include "unicode/unistr.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/uchar.h> +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/utf16.h> U_NAMESPACE_BEGIN diff --git a/icuSources/common/unistr_titlecase_brkiter.cpp b/icuSources/common/unistr_titlecase_brkiter.cpp index 4969884..9877bee 100644 --- a/icuSources/common/unistr_titlecase_brkiter.cpp +++ b/icuSources/common/unistr_titlecase_brkiter.cpp @@ -17,14 +17,14 @@ * were moved here to break dependency cycles among parts of the common library. */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_BREAK_ITERATION -#include "unicode/brkiter.h" -#include "unicode/locid.h" -#include "unicode/ucasemap.h" -#include "unicode/unistr.h" +#include <_foundation_unicode/brkiter.h> +#include <_foundation_unicode/locid.h> +#include <_foundation_unicode/ucasemap.h> +#include <_foundation_unicode/unistr.h> #include "ucasemap_imp.h" U_NAMESPACE_BEGIN diff --git a/icuSources/common/unistrappender.h b/icuSources/common/unistrappender.h index 75fcb9e..512f77b 100644 --- a/icuSources/common/unistrappender.h +++ b/icuSources/common/unistrappender.h @@ -13,10 +13,10 @@ #ifndef __UNISTRAPPENDER_H__ #define __UNISTRAPPENDER_H__ -#include "unicode/unistr.h" -#include "unicode/uobject.h" -#include "unicode/utf16.h" -#include "unicode/utypes.h" +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/uobject.h> +#include <_foundation_unicode/utf16.h> +#include <_foundation_unicode/utypes.h> #include "cmemory.h" U_NAMESPACE_BEGIN diff --git a/icuSources/common/unorm.cpp b/icuSources/common/unorm.cpp index cf3915c..8cd3b38 100644 --- a/icuSources/common/unorm.cpp +++ b/icuSources/common/unorm.cpp @@ -25,15 +25,15 @@ * 2009-nov..2010-jan Markus Scherer total rewrite, new Normalizer2 API & code */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_NORMALIZATION -#include "unicode/udata.h" -#include "unicode/ustring.h" -#include "unicode/uiter.h" -#include "unicode/unorm.h" -#include "unicode/unorm2.h" +#include <_foundation_unicode/udata.h> +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/uiter.h> +#include <_foundation_unicode/unorm.h> +#include <_foundation_unicode/unorm2.h> #include "normalizer2impl.h" #include "unormimp.h" #include "uprops.h" diff --git a/icuSources/common/unormcmp.cpp b/icuSources/common/unormcmp.cpp index e224190..7d3f5af 100644 --- a/icuSources/common/unormcmp.cpp +++ b/icuSources/common/unormcmp.cpp @@ -20,12 +20,12 @@ * Allows unorm.cpp to not depend on any character properties code. */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_NORMALIZATION -#include "unicode/unorm.h" -#include "unicode/ustring.h" +#include <_foundation_unicode/unorm.h> +#include <_foundation_unicode/ustring.h> #include "cmemory.h" #include "normalizer2impl.h" #include "ucase.h" diff --git a/icuSources/common/unormimp.h b/icuSources/common/unormimp.h index d2604ad..b3c4746 100644 --- a/icuSources/common/unormimp.h +++ b/icuSources/common/unormimp.h @@ -19,7 +19,7 @@ #ifndef __UNORMIMP_H__ #define __UNORMIMP_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_NORMALIZATION diff --git a/icuSources/common/uobject.cpp b/icuSources/common/uobject.cpp index e222b2c..609e406 100644 --- a/icuSources/common/uobject.cpp +++ b/icuSources/common/uobject.cpp @@ -16,7 +16,7 @@ * created by: Markus W. Scherer */ -#include "unicode/uobject.h" +#include <_foundation_unicode/uobject.h> #include "cmemory.h" U_NAMESPACE_BEGIN diff --git a/icuSources/common/uprops.cpp b/icuSources/common/uprops.cpp index 48eeaff..c793d77 100644 --- a/icuSources/common/uprops.cpp +++ b/icuSources/common/uprops.cpp @@ -23,14 +23,14 @@ * including those for normalization and case mappings. */ -#include "unicode/utypes.h" -#include "unicode/uchar.h" -#include "unicode/ucptrie.h" -#include "unicode/udata.h" -#include "unicode/unorm2.h" -#include "unicode/uscript.h" -#include "unicode/ustring.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/uchar.h> +#include <_foundation_unicode/ucptrie.h> +#include <_foundation_unicode/udata.h> +#include <_foundation_unicode/unorm2.h> +#include <_foundation_unicode/uscript.h> +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/utf16.h> #include "cstring.h" #include "emojiprops.h" #include "mutex.h" diff --git a/icuSources/common/uprops.h b/icuSources/common/uprops.h index 2004394..4d8e45e 100644 --- a/icuSources/common/uprops.h +++ b/icuSources/common/uprops.h @@ -22,8 +22,8 @@ #ifndef __UPROPS_H__ #define __UPROPS_H__ -#include "unicode/utypes.h" -#include "unicode/uset.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/uset.h> #include "uset_imp.h" #include "udataswp.h" diff --git a/icuSources/common/urbtok.cpp b/icuSources/common/urbtok.cpp index 2b3c669..8b8bfe9 100644 --- a/icuSources/common/urbtok.cpp +++ b/icuSources/common/urbtok.cpp @@ -10,14 +10,14 @@ ***************************************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_BREAK_ITERATION -#include "unicode/urbtok.h" +#include <_foundation_unicode/urbtok.h> -#include "unicode/ustring.h" -#include "unicode/rbbi.h" +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/rbbi.h> #include "rbbirb.h" #include "rbbidata.h" #include "rbbidata57.h" diff --git a/icuSources/common/ures_cnv.cpp b/icuSources/common/ures_cnv.cpp index 1aa58e7..f1b983d 100644 --- a/icuSources/common/ures_cnv.cpp +++ b/icuSources/common/ures_cnv.cpp @@ -18,11 +18,11 @@ * Character conversion functions moved here from uresbund.c */ -#include "unicode/utypes.h" -#include "unicode/putil.h" -#include "unicode/ustring.h" -#include "unicode/ucnv.h" -#include "unicode/ures.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/putil.h> +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/ucnv.h> +#include <_foundation_unicode/ures.h> #include "uinvchar.h" #include "ustr_cnv.h" diff --git a/icuSources/common/uresbund.cpp b/icuSources/common/uresbund.cpp index cec25b7..1939382 100644 --- a/icuSources/common/uresbund.cpp +++ b/icuSources/common/uresbund.cpp @@ -21,9 +21,9 @@ ****************************************************************************** */ -#include "unicode/ures.h" -#include "unicode/ustring.h" -#include "unicode/ucnv.h" +#include <_foundation_unicode/ures.h> +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/ucnv.h> #include "charstr.h" #include "uresimp.h" #include "ustr_imp.h" @@ -33,7 +33,7 @@ #include "cstring.h" #include "mutex.h" #include "uhash.h" -#include "unicode/uenum.h" +#include <_foundation_unicode/uenum.h> #include "uenumimp.h" #include "ulocimp.h" #include "umutex.h" diff --git a/icuSources/common/uresdata.cpp b/icuSources/common/uresdata.cpp index a1222d4..cff6b06 100644 --- a/icuSources/common/uresdata.cpp +++ b/icuSources/common/uresdata.cpp @@ -19,10 +19,10 @@ * 06/24/02 weiv Added support for resource sharing */ -#include "unicode/utypes.h" -#include "unicode/udata.h" -#include "unicode/ustring.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/udata.h> +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/utf16.h> #include "cmemory.h" #include "cstring.h" #include "resource.h" diff --git a/icuSources/common/uresdata.h b/icuSources/common/uresdata.h index b8a3adb..e71fdc5 100644 --- a/icuSources/common/uresdata.h +++ b/icuSources/common/uresdata.h @@ -18,9 +18,9 @@ #ifndef __RESDATA_H__ #define __RESDATA_H__ -#include "unicode/utypes.h" -#include "unicode/udata.h" -#include "unicode/ures.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/udata.h> +#include <_foundation_unicode/ures.h> #include "putilimp.h" #include "udataswp.h" @@ -327,7 +327,7 @@ enum { * Most resources have their values stored at four-byte offsets from the start * of the resource data. These values are at least 4-aligned. * Some resource values are stored directly in the offset field of the Resource itself. - * See UResType in unicode/ures.h for enumeration constants for Resource types. + * See UResType in _foundation_unicode/ures.h for enumeration constants for Resource types. * * Some resources have their values stored as sequences of 16-bit units, * at 2-byte offsets from the start of a contiguous 16-bit-unit array between diff --git a/icuSources/common/uresimp.h b/icuSources/common/uresimp.h index 00b3a51..5363584 100644 --- a/icuSources/common/uresimp.h +++ b/icuSources/common/uresimp.h @@ -10,8 +10,8 @@ #ifndef URESIMP_H #define URESIMP_H -#include "unicode/ures.h" -#include "unicode/utypes.h" +#include <_foundation_unicode/ures.h> +#include <_foundation_unicode/utypes.h> #include "uresdata.h" diff --git a/icuSources/common/ureslocs.h b/icuSources/common/ureslocs.h index f7c3344..8bd73ac 100644 --- a/icuSources/common/ureslocs.h +++ b/icuSources/common/ureslocs.h @@ -10,8 +10,8 @@ #ifndef __URESLOCS_H__ #define __URESLOCS_H__ -#include "unicode/utypes.h" -#include "unicode/udata.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/udata.h> U_CDECL_BEGIN diff --git a/icuSources/common/usc_impl.cpp b/icuSources/common/usc_impl.cpp index a4e2fc6..e7e9ae2 100644 --- a/icuSources/common/usc_impl.cpp +++ b/icuSources/common/usc_impl.cpp @@ -15,7 +15,7 @@ ****************************************************************************** */ -#include "unicode/uscript.h" +#include <_foundation_unicode/uscript.h> #include "usc_impl.h" #include "cmemory.h" diff --git a/icuSources/common/usc_impl.h b/icuSources/common/usc_impl.h index cd76990..65a215b 100644 --- a/icuSources/common/usc_impl.h +++ b/icuSources/common/usc_impl.h @@ -17,8 +17,8 @@ #ifndef USC_IMPL_H #define USC_IMPL_H -#include "unicode/utypes.h" -#include "unicode/uscript.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/uscript.h> /** * UScriptRun is used to find runs of characters in diff --git a/icuSources/common/uscript.cpp b/icuSources/common/uscript.cpp index 2b3c28d..78bce8a 100644 --- a/icuSources/common/uscript.cpp +++ b/icuSources/common/uscript.cpp @@ -15,9 +15,9 @@ ****************************************************************************** */ -#include "unicode/uchar.h" -#include "unicode/uscript.h" -#include "unicode/uloc.h" +#include <_foundation_unicode/uchar.h> +#include <_foundation_unicode/uscript.h> +#include <_foundation_unicode/uloc.h> #include "bytesinkutil.h" #include "charstr.h" #include "cmemory.h" diff --git a/icuSources/common/uscript_props.cpp b/icuSources/common/uscript_props.cpp index 886acfa..85bc0bc 100644 --- a/icuSources/common/uscript_props.cpp +++ b/icuSources/common/uscript_props.cpp @@ -14,10 +14,10 @@ * created by: Markus W. Scherer */ -#include "unicode/utypes.h" -#include "unicode/unistr.h" -#include "unicode/uscript.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/uscript.h> +#include <_foundation_unicode/utf16.h> #include "ustr_imp.h" #include "cmemory.h" diff --git a/icuSources/common/uset.cpp b/icuSources/common/uset.cpp index 2152693..df1615a 100644 --- a/icuSources/common/uset.cpp +++ b/icuSources/common/uset.cpp @@ -20,13 +20,13 @@ * instantiating a new USet. */ -#include "unicode/utypes.h" -#include "unicode/uobject.h" -#include "unicode/uset.h" -#include "unicode/uniset.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/uobject.h> +#include <_foundation_unicode/uset.h> +#include <_foundation_unicode/uniset.h> #include "cmemory.h" -#include "unicode/ustring.h" -#include "unicode/parsepos.h" +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/parsepos.h> U_NAMESPACE_USE diff --git a/icuSources/common/uset_imp.h b/icuSources/common/uset_imp.h index 7233b93..7bad767 100644 --- a/icuSources/common/uset_imp.h +++ b/icuSources/common/uset_imp.h @@ -21,8 +21,8 @@ #ifndef __USET_IMP_H__ #define __USET_IMP_H__ -#include "unicode/utypes.h" -#include "unicode/uset.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/uset.h> U_CDECL_BEGIN diff --git a/icuSources/common/uset_props.cpp b/icuSources/common/uset_props.cpp index f08e760..f2af9e0 100644 --- a/icuSources/common/uset_props.cpp +++ b/icuSources/common/uset_props.cpp @@ -19,13 +19,13 @@ * uniset_props.cpp, split off for modularization. */ -#include "unicode/utypes.h" -#include "unicode/uobject.h" -#include "unicode/uset.h" -#include "unicode/uniset.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/uobject.h> +#include <_foundation_unicode/uset.h> +#include <_foundation_unicode/uniset.h> #include "cmemory.h" -#include "unicode/ustring.h" -#include "unicode/parsepos.h" +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/parsepos.h> U_NAMESPACE_USE diff --git a/icuSources/common/usetiter.cpp b/icuSources/common/usetiter.cpp index 3cdece5..723e880 100644 --- a/icuSources/common/usetiter.cpp +++ b/icuSources/common/usetiter.cpp @@ -6,9 +6,9 @@ * Corporation and others. All Rights Reserved. ********************************************************************** */ -#include "unicode/usetiter.h" -#include "unicode/uniset.h" -#include "unicode/unistr.h" +#include <_foundation_unicode/usetiter.h> +#include <_foundation_unicode/uniset.h> +#include <_foundation_unicode/unistr.h> #include "uvector.h" U_NAMESPACE_BEGIN diff --git a/icuSources/common/ushape.cpp b/icuSources/common/ushape.cpp index babbbe5..bdd32ec 100644 --- a/icuSources/common/ushape.cpp +++ b/icuSources/common/ushape.cpp @@ -18,10 +18,10 @@ * Arabic letter shaping implemented by Ayman Roshdy */ -#include "unicode/utypes.h" -#include "unicode/uchar.h" -#include "unicode/ustring.h" -#include "unicode/ushape.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/uchar.h> +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/ushape.h> #include "cmemory.h" #include "putilimp.h" #include "ustr_imp.h" diff --git a/icuSources/common/usprep.cpp b/icuSources/common/usprep.cpp index 50d1608..0aeafde 100644 --- a/icuSources/common/usprep.cpp +++ b/icuSources/common/usprep.cpp @@ -16,16 +16,16 @@ * created by: Ram Viswanadha */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_IDNA -#include "unicode/usprep.h" +#include <_foundation_unicode/usprep.h> -#include "unicode/normalizer2.h" -#include "unicode/ustring.h" -#include "unicode/uchar.h" -#include "unicode/uversion.h" +#include <_foundation_unicode/normalizer2.h> +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/uchar.h> +#include <_foundation_unicode/uversion.h> #include "umutex.h" #include "cmemory.h" #include "sprpimpl.h" diff --git a/icuSources/common/ustr_cnv.cpp b/icuSources/common/ustr_cnv.cpp index 97fbc52..dc94857 100644 --- a/icuSources/common/ustr_cnv.cpp +++ b/icuSources/common/ustr_cnv.cpp @@ -18,12 +18,12 @@ * Character conversion functions moved here from ustring.c */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_CONVERSION -#include "unicode/ustring.h" -#include "unicode/ucnv.h" +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/ucnv.h> #include "cstring.h" #include "cmemory.h" #include "umutex.h" diff --git a/icuSources/common/ustr_cnv.h b/icuSources/common/ustr_cnv.h index 861e3eb..9795d50 100644 --- a/icuSources/common/ustr_cnv.h +++ b/icuSources/common/ustr_cnv.h @@ -17,8 +17,8 @@ #ifndef USTR_CNV_IMP_H #define USTR_CNV_IMP_H -#include "unicode/utypes.h" -#include "unicode/ucnv.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/ucnv.h> #if !UCONFIG_NO_CONVERSION diff --git a/icuSources/common/ustr_imp.h b/icuSources/common/ustr_imp.h index 2677d6d..b81bf51 100644 --- a/icuSources/common/ustr_imp.h +++ b/icuSources/common/ustr_imp.h @@ -17,8 +17,8 @@ #ifndef __USTR_IMP_H__ #define __USTR_IMP_H__ -#include "unicode/utypes.h" -#include "unicode/utf8.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/utf8.h> /** * Internal option for unorm_cmpEquivFold() for strncmp style. diff --git a/icuSources/common/ustr_titlecase_brkiter.cpp b/icuSources/common/ustr_titlecase_brkiter.cpp index 85dfa0d..942105b 100644 --- a/icuSources/common/ustr_titlecase_brkiter.cpp +++ b/icuSources/common/ustr_titlecase_brkiter.cpp @@ -17,17 +17,17 @@ * were moved here to break dependency cycles among parts of the common library. */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_BREAK_ITERATION -#include "unicode/brkiter.h" -#include "unicode/casemap.h" -#include "unicode/chariter.h" -#include "unicode/localpointer.h" -#include "unicode/ubrk.h" -#include "unicode/ucasemap.h" -#include "unicode/utext.h" +#include <_foundation_unicode/brkiter.h> +#include <_foundation_unicode/casemap.h> +#include <_foundation_unicode/chariter.h> +#include <_foundation_unicode/localpointer.h> +#include <_foundation_unicode/ubrk.h> +#include <_foundation_unicode/ucasemap.h> +#include <_foundation_unicode/utext.h> #include "cmemory.h" #include "uassert.h" #include "ucase.h" diff --git a/icuSources/common/ustr_wcs.cpp b/icuSources/common/ustr_wcs.cpp index 1a6ea23..adf1412 100644 --- a/icuSources/common/ustr_wcs.cpp +++ b/icuSources/common/ustr_wcs.cpp @@ -19,8 +19,8 @@ * moved here from ustrtrns.c for better modularization. */ -#include "unicode/utypes.h" -#include "unicode/ustring.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/ustring.h> #include "cstring.h" #include "cwchar.h" #include "cmemory.h" diff --git a/icuSources/common/ustrcase.cpp b/icuSources/common/ustrcase.cpp index 8037c09..3ff28ba 100644 --- a/icuSources/common/ustrcase.cpp +++ b/icuSources/common/ustrcase.cpp @@ -20,16 +20,16 @@ * to the Unicode Character Database (uprops.dat). */ -#include "unicode/utypes.h" -#include "unicode/brkiter.h" -#include "unicode/casemap.h" -#include "unicode/edits.h" -#include "unicode/stringoptions.h" -#include "unicode/ustring.h" -#include "unicode/ucasemap.h" -#include "unicode/ubrk.h" -#include "unicode/utf.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/brkiter.h> +#include <_foundation_unicode/casemap.h> +#include <_foundation_unicode/edits.h> +#include <_foundation_unicode/stringoptions.h> +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/ucasemap.h> +#include <_foundation_unicode/ubrk.h> +#include <_foundation_unicode/utf.h> +#include <_foundation_unicode/utf16.h> #include "cmemory.h" #include "ucase.h" #include "ucasemap_imp.h" diff --git a/icuSources/common/ustrcase_locale.cpp b/icuSources/common/ustrcase_locale.cpp index 2ecd24f..1797333 100644 --- a/icuSources/common/ustrcase_locale.cpp +++ b/icuSources/common/ustrcase_locale.cpp @@ -17,13 +17,13 @@ * were moved here to break dependency cycles among parts of the common library. */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #include "uassert.h" -#include "unicode/brkiter.h" -#include "unicode/casemap.h" -#include "unicode/ucasemap.h" -#include "unicode/uloc.h" -#include "unicode/ustring.h" +#include <_foundation_unicode/brkiter.h> +#include <_foundation_unicode/casemap.h> +#include <_foundation_unicode/ucasemap.h> +#include <_foundation_unicode/uloc.h> +#include <_foundation_unicode/ustring.h> #include "ucase.h" #include "ucasemap_imp.h" diff --git a/icuSources/common/ustrenum.cpp b/icuSources/common/ustrenum.cpp index 08a1bf2..f4b1d0b 100644 --- a/icuSources/common/ustrenum.cpp +++ b/icuSources/common/ustrenum.cpp @@ -12,9 +12,9 @@ */ #include "utypeinfo.h" // for 'typeid' to work -#include "unicode/ustring.h" -#include "unicode/strenum.h" -#include "unicode/putil.h" +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/strenum.h> +#include <_foundation_unicode/putil.h> #include "uenumimp.h" #include "ustrenum.h" #include "cstring.h" diff --git a/icuSources/common/ustrenum.h b/icuSources/common/ustrenum.h index 3703ded..f4e5554 100644 --- a/icuSources/common/ustrenum.h +++ b/icuSources/common/ustrenum.h @@ -13,8 +13,8 @@ #ifndef _USTRENUM_H_ #define _USTRENUM_H_ -#include "unicode/uenum.h" -#include "unicode/strenum.h" +#include <_foundation_unicode/uenum.h> +#include <_foundation_unicode/strenum.h> //---------------------------------------------------------------------- U_NAMESPACE_BEGIN diff --git a/icuSources/common/ustrfmt.h b/icuSources/common/ustrfmt.h index 53eb055..114646f 100644 --- a/icuSources/common/ustrfmt.h +++ b/icuSources/common/ustrfmt.h @@ -10,7 +10,7 @@ #ifndef USTRFMT_H #define USTRFMT_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> U_CAPI int32_t U_EXPORT2 uprv_itou (UChar * buffer, int32_t capacity, uint32_t i, uint32_t radix, int32_t minwidth); diff --git a/icuSources/common/ustring.cpp b/icuSources/common/ustring.cpp index c670327..05d2217 100644 --- a/icuSources/common/ustring.cpp +++ b/icuSources/common/ustring.cpp @@ -17,11 +17,11 @@ ****************************************************************************** */ -#include "unicode/utypes.h" -#include "unicode/putil.h" -#include "unicode/uchar.h" -#include "unicode/ustring.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/putil.h> +#include <_foundation_unicode/uchar.h> +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/utf16.h> #include "cstring.h" #include "cwchar.h" #include "cmemory.h" diff --git a/icuSources/common/ustrtrns.cpp b/icuSources/common/ustrtrns.cpp index dcb9dc5..44fee1e 100644 --- a/icuSources/common/ustrtrns.cpp +++ b/icuSources/common/ustrtrns.cpp @@ -26,11 +26,11 @@ */ -#include "unicode/putil.h" -#include "unicode/ustring.h" -#include "unicode/utf.h" -#include "unicode/utf8.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/putil.h> +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/utf.h> +#include <_foundation_unicode/utf8.h> +#include <_foundation_unicode/utf16.h> #include "cstring.h" #include "cmemory.h" #include "ustr_imp.h" diff --git a/icuSources/common/utext.cpp b/icuSources/common/utext.cpp index 55acd1d..122ef0d 100644 --- a/icuSources/common/utext.cpp +++ b/icuSources/common/utext.cpp @@ -18,14 +18,14 @@ #include -#include "unicode/utypes.h" -#include "unicode/ustring.h" -#include "unicode/unistr.h" -#include "unicode/chariter.h" -#include "unicode/utext.h" -#include "unicode/utf.h" -#include "unicode/utf8.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/chariter.h> +#include <_foundation_unicode/utext.h> +#include <_foundation_unicode/utf.h> +#include <_foundation_unicode/utf8.h> +#include <_foundation_unicode/utf16.h> #include "ustr_imp.h" #include "cmemory.h" #include "cstring.h" diff --git a/icuSources/common/utf_impl.cpp b/icuSources/common/utf_impl.cpp index a1f9c65..5e6a52e 100644 --- a/icuSources/common/utf_impl.cpp +++ b/icuSources/common/utf_impl.cpp @@ -24,9 +24,9 @@ # define U_UTF8_IMPL #endif -#include "unicode/utypes.h" -#include "unicode/utf.h" -#include "unicode/utf8.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/utf.h> +#include <_foundation_unicode/utf8.h> #include "uassert.h" /* @@ -87,7 +87,7 @@ utf8_countTrailBytes[256]={ static const UChar32 utf8_errorValue[6]={ // Same values as UTF8_ERROR_VALUE_1, UTF8_ERROR_VALUE_2, UTF_ERROR_VALUE, - // but without relying on the obsolete unicode/utf_old.h. + // but without relying on the obsolete _foundation_unicode/utf_old.h. 0x15, 0x9f, 0xffff, 0x10ffff }; diff --git a/icuSources/common/util.cpp b/icuSources/common/util.cpp index 3dcc055..e66e181 100644 --- a/icuSources/common/util.cpp +++ b/icuSources/common/util.cpp @@ -10,8 +10,8 @@ ********************************************************************** */ -#include "unicode/unimatch.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/unimatch.h> +#include <_foundation_unicode/utf16.h> #include "patternprops.h" #include "util.h" diff --git a/icuSources/common/util.h b/icuSources/common/util.h index 4a9ae83..85d5123 100644 --- a/icuSources/common/util.h +++ b/icuSources/common/util.h @@ -14,9 +14,9 @@ #define ICU_UTIL_H #include "charstr.h" -#include "unicode/unistr.h" -#include "unicode/uobject.h" -#include "unicode/utypes.h" +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/uobject.h> +#include <_foundation_unicode/utypes.h> //-------------------------------------------------------------------- // class ICU_Utility // i18n utility functions, scoped into the class ICU_Utility. diff --git a/icuSources/common/util_props.cpp b/icuSources/common/util_props.cpp index d6ae052..e6f0317 100644 --- a/icuSources/common/util_props.cpp +++ b/icuSources/common/util_props.cpp @@ -10,8 +10,8 @@ ********************************************************************** */ -#include "unicode/uchar.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/uchar.h> +#include <_foundation_unicode/utf16.h> #include "patternprops.h" #include "util.h" diff --git a/icuSources/common/utrace.cpp b/icuSources/common/utrace.cpp index f7b8ade..68333f0 100644 --- a/icuSources/common/utrace.cpp +++ b/icuSources/common/utrace.cpp @@ -11,7 +11,7 @@ * indentation:4 */ -#include "unicode/utrace.h" +#include <_foundation_unicode/utrace.h> #include "utracimp.h" #include "cstring.h" #include "uassert.h" diff --git a/icuSources/common/utracimp.h b/icuSources/common/utracimp.h index 945540d..5deca29 100644 --- a/icuSources/common/utracimp.h +++ b/icuSources/common/utracimp.h @@ -42,7 +42,7 @@ #ifndef __UTRACIMP_H__ #define __UTRACIMP_H__ -#include "unicode/utrace.h" +#include <_foundation_unicode/utrace.h> #include U_CDECL_BEGIN diff --git a/icuSources/common/utrie.cpp b/icuSources/common/utrie.cpp index 96f2397..ca2f3cb 100644 --- a/icuSources/common/utrie.cpp +++ b/icuSources/common/utrie.cpp @@ -24,7 +24,7 @@ # include #endif -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #include "cmemory.h" #include "utrie.h" diff --git a/icuSources/common/utrie.h b/icuSources/common/utrie.h index 2fd2c46..0a57d0f 100644 --- a/icuSources/common/utrie.h +++ b/icuSources/common/utrie.h @@ -19,8 +19,8 @@ #ifndef __UTRIE_H__ #define __UTRIE_H__ -#include "unicode/utypes.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/utf16.h> U_CDECL_BEGIN diff --git a/icuSources/common/utrie2.cpp b/icuSources/common/utrie2.cpp index 0fb74ba..57d7991 100644 --- a/icuSources/common/utrie2.cpp +++ b/icuSources/common/utrie2.cpp @@ -24,13 +24,13 @@ * This file contains only the runtime and enumeration code, for read-only access. * See utrie2_builder.c for the builder code. */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #ifdef UCPTRIE_DEBUG -#include "unicode/umutablecptrie.h" +#include <_foundation_unicode/umutablecptrie.h> #endif -#include "unicode/utf.h" -#include "unicode/utf8.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/utf.h> +#include <_foundation_unicode/utf8.h> +#include <_foundation_unicode/utf16.h> #include "cmemory.h" #include "utrie2.h" #include "utrie2_impl.h" diff --git a/icuSources/common/utrie2.h b/icuSources/common/utrie2.h index ace52cc..eb45357 100644 --- a/icuSources/common/utrie2.h +++ b/icuSources/common/utrie2.h @@ -19,8 +19,8 @@ #ifndef __UTRIE2_H__ #define __UTRIE2_H__ -#include "unicode/utypes.h" -#include "unicode/utf8.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/utf8.h> #include "putilimp.h" U_CDECL_BEGIN @@ -591,8 +591,8 @@ U_CDECL_END #ifdef __cplusplus -#include "unicode/uobject.h" -#include "unicode/utf.h" +#include <_foundation_unicode/uobject.h> +#include <_foundation_unicode/utf.h> U_NAMESPACE_BEGIN diff --git a/icuSources/common/utrie2_builder.cpp b/icuSources/common/utrie2_builder.cpp index 2513332..0aceb8b 100644 --- a/icuSources/common/utrie2_builder.cpp +++ b/icuSources/common/utrie2_builder.cpp @@ -30,10 +30,10 @@ #endif // #define UCPTRIE_DEBUG -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #ifdef UCPTRIE_DEBUG -#include "unicode/ucptrie.h" -#include "unicode/umutablecptrie.h" +#include <_foundation_unicode/ucptrie.h> +#include <_foundation_unicode/umutablecptrie.h> #include "ucptrie_impl.h" #endif #include "cmemory.h" diff --git a/icuSources/common/utrie2_impl.h b/icuSources/common/utrie2_impl.h index 2a14db3..d0a9bbb 100644 --- a/icuSources/common/utrie2_impl.h +++ b/icuSources/common/utrie2_impl.h @@ -23,7 +23,7 @@ #define __UTRIE2_IMPL_H__ #ifdef UCPTRIE_DEBUG -#include "unicode/umutablecptrie.h" +#include <_foundation_unicode/umutablecptrie.h> #endif #include "utrie2.h" diff --git a/icuSources/common/utrie_swap.cpp b/icuSources/common/utrie_swap.cpp index b01b946..f96a4b1 100644 --- a/icuSources/common/utrie_swap.cpp +++ b/icuSources/common/utrie_swap.cpp @@ -4,7 +4,7 @@ // utrie_swap.cpp // created: 2018aug08 Markus W. Scherer -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #include "cmemory.h" #include "ucptrie_impl.h" #include "udataswp.h" diff --git a/icuSources/common/uts46.cpp b/icuSources/common/uts46.cpp index 10a4f56..9183132 100644 --- a/icuSources/common/uts46.cpp +++ b/icuSources/common/uts46.cpp @@ -14,15 +14,15 @@ * created by: Markus W. Scherer */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_IDNA -#include "unicode/idna.h" -#include "unicode/normalizer2.h" -#include "unicode/uscript.h" -#include "unicode/ustring.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/idna.h> +#include <_foundation_unicode/normalizer2.h> +#include <_foundation_unicode/uscript.h> +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/utf16.h> #include "cmemory.h" #include "cstring.h" #include "punycode.h" diff --git a/icuSources/common/utypes.cpp b/icuSources/common/utypes.cpp index 63e05b1..bd1305f 100644 --- a/icuSources/common/utypes.cpp +++ b/icuSources/common/utypes.cpp @@ -15,7 +15,7 @@ ****************************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> /* u_errorName() ------------------------------------------------------------ */ diff --git a/icuSources/common/uvector.h b/icuSources/common/uvector.h index 1eb7d13..c18b5a4 100644 --- a/icuSources/common/uvector.h +++ b/icuSources/common/uvector.h @@ -14,8 +14,8 @@ #ifndef UVECTOR_H #define UVECTOR_H -#include "unicode/utypes.h" -#include "unicode/uobject.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/uobject.h> #include "cmemory.h" #include "uarrsort.h" #include "uelement.h" diff --git a/icuSources/common/uvectr32.h b/icuSources/common/uvectr32.h index a7fada3..d290183 100644 --- a/icuSources/common/uvectr32.h +++ b/icuSources/common/uvectr32.h @@ -16,8 +16,8 @@ #ifndef UVECTOR32_H #define UVECTOR32_H -#include "unicode/utypes.h" -#include "unicode/uobject.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/uobject.h> #include "uhash.h" #include "uassert.h" diff --git a/icuSources/common/uvectr64.h b/icuSources/common/uvectr64.h index 070e2dd..56949a9 100644 --- a/icuSources/common/uvectr64.h +++ b/icuSources/common/uvectr64.h @@ -16,8 +16,8 @@ #ifndef UVECTOR64_H #define UVECTOR64_H -#include "unicode/utypes.h" -#include "unicode/uobject.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/uobject.h> #include "uhash.h" #include "uassert.h" diff --git a/icuSources/common/wintz.cpp b/icuSources/common/wintz.cpp index 1bc08ae..f8b109d 100644 --- a/icuSources/common/wintz.cpp +++ b/icuSources/common/wintz.cpp @@ -11,7 +11,7 @@ ******************************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_PLATFORM_USES_ONLY_WIN32_API @@ -20,8 +20,8 @@ #include "cmemory.h" #include "cstring.h" -#include "unicode/ures.h" -#include "unicode/unistr.h" +#include <_foundation_unicode/ures.h> +#include <_foundation_unicode/unistr.h> #include "uresimp.h" #ifndef WIN32_LEAN_AND_MEAN diff --git a/icuSources/common/wintz.h b/icuSources/common/wintz.h index ce9c1e9..1868ecf 100644 --- a/icuSources/common/wintz.h +++ b/icuSources/common/wintz.h @@ -14,7 +14,7 @@ #ifndef __WINTZ #define __WINTZ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_PLATFORM_USES_ONLY_WIN32_API diff --git a/icuSources/i18n/CMakeLists.txt b/icuSources/i18n/CMakeLists.txt new file mode 100644 index 0000000..fb0bbd3 --- /dev/null +++ b/icuSources/i18n/CMakeLists.txt @@ -0,0 +1,262 @@ +##===----------------------------------------------------------------------===## +## +## This source file is part of the SwiftFoundation open source project +## +## Copyright (c) 2024 Apple Inc. and the SwiftFoundation project authors +## Licensed under Apache License v2.0 +## +## See LICENSE.txt for license information +## See CONTRIBUTORS.md for the list of SwiftFoundation project authors +## +## SPDX-License-Identifier: Apache-2.0 +## +##===----------------------------------------------------------------------===## + +target_include_directories(_FoundationICU PRIVATE .) + +target_sources(_FoundationICU + PRIVATE + anytrans.cpp + astro.cpp + basictz.cpp + bocsu.cpp + brktrans.cpp + buddhcal.cpp + calendar.cpp + casetrn.cpp + cecal.cpp + chnsecal.cpp + choicfmt.cpp + coleitr.cpp + coll.cpp + collation.cpp + collationbuilder.cpp + collationcompare.cpp + collationdata.cpp + collationdatabuilder.cpp + collationdatareader.cpp + collationdatawriter.cpp + collationfastlatin.cpp + collationfastlatinbuilder.cpp + collationfcd.cpp + collationiterator.cpp + collationkeys.cpp + collationroot.cpp + collationrootelements.cpp + collationruleparser.cpp + collationsets.cpp + collationsettings.cpp + collationtailoring.cpp + collationweights.cpp + compactdecimalformat.cpp + coptccal.cpp + cpdtrans.cpp + csdetect.cpp + csmatch.cpp + csr2022.cpp + csrecog.cpp + csrmbcs.cpp + csrsbcs.cpp + csrucode.cpp + csrutf8.cpp + curramt.cpp + currfmt.cpp + currpinf.cpp + currunit.cpp + dangical.cpp + datefmt.cpp + dayperiodrules.cpp + dcfmtsym.cpp + decContext.cpp + decNumber.cpp + decimfmt.cpp + displayoptions.cpp + double-conversion-bignum-dtoa.cpp + double-conversion-bignum.cpp + double-conversion-cached-powers.cpp + double-conversion-double-to-string.cpp + double-conversion-fast-dtoa.cpp + double-conversion-string-to-double.cpp + double-conversion-strtod.cpp + dtfmtsym.cpp + dtitvfmt.cpp + dtitvinf.cpp + dtptngen.cpp + dtrule.cpp + erarules.cpp + esctrn.cpp + ethpccal.cpp + fmtable.cpp + fmtable_cnv.cpp + format.cpp + formatted_string_builder.cpp + formattedval_iterimpl.cpp + formattedval_sbimpl.cpp + formattedvalue.cpp + fphdlimp.cpp + fpositer.cpp + funcrepl.cpp + gender.cpp + gregocal.cpp + gregoimp.cpp + hebrwcal.cpp + icuin40shim.cpp + indiancal.cpp + inputext.cpp + islamcal.cpp + japancal.cpp + listformatter.cpp + measfmt.cpp + measunit.cpp + measunit_extra.cpp + measure.cpp + msgfmt.cpp + name2uni.cpp + nfrs.cpp + nfrule.cpp + nfsubs.cpp + nortrans.cpp + nultrans.cpp + number_affixutils.cpp + number_asformat.cpp + number_capi.cpp + number_compact.cpp + number_currencysymbols.cpp + number_decimalquantity.cpp + number_decimfmtprops.cpp + number_fluent.cpp + number_formatimpl.cpp + number_grouping.cpp + number_integerwidth.cpp + number_longnames.cpp + number_mapper.cpp + number_modifiers.cpp + number_multiplier.cpp + number_notation.cpp + number_output.cpp + number_padding.cpp + number_patternmodifier.cpp + number_patternstring.cpp + number_rounding.cpp + number_scientific.cpp + number_skeletons.cpp + number_symbolswrapper.cpp + number_usageprefs.cpp + number_utils.cpp + numfmt.cpp + numparse_affixes.cpp + numparse_compositions.cpp + numparse_currency.cpp + numparse_decimal.cpp + numparse_impl.cpp + numparse_parsednumber.cpp + numparse_scientific.cpp + numparse_symbols.cpp + numparse_validators.cpp + numrange_capi.cpp + numrange_fluent.cpp + numrange_impl.cpp + numsys.cpp + olsontz.cpp + persncal.cpp + pluralranges.cpp + plurfmt.cpp + plurrule.cpp + quant.cpp + quantityformatter.cpp + rbnf.cpp + rbt.cpp + rbt_data.cpp + rbt_pars.cpp + rbt_rule.cpp + rbt_set.cpp + rbtz.cpp + regexcmp.cpp + regeximp.cpp + regexst.cpp + regextxt.cpp + region.cpp + reldatefmt.cpp + reldtfmt.cpp + rematch.cpp + remtrans.cpp + repattrn.cpp + rulebasedcollator.cpp + scientificnumberformatter.cpp + scriptset.cpp + search.cpp + selfmt.cpp + sharedbreakiterator.cpp + simpletz.cpp + smpdtfmt.cpp + smpdtfst.cpp + sortkey.cpp + standardplural.cpp + string_segment.cpp + strmatch.cpp + strrepl.cpp + stsearch.cpp + taiwncal.cpp + timezone.cpp + titletrn.cpp + tmunit.cpp + tmutamt.cpp + tmutfmt.cpp + tolowtrn.cpp + toupptrn.cpp + translit.cpp + transreg.cpp + tridpars.cpp + tzfmt.cpp + tzgnames.cpp + tznames.cpp + tznames_impl.cpp + tzrule.cpp + tztrans.cpp + uameasureformat.cpp + uatimeunitformat.cpp + ucal.cpp + ucln_in.cpp + ucol.cpp + ucol_res.cpp + ucol_sit.cpp + ucoleitr.cpp + ucsdet.cpp + udat.cpp + udateintervalformat.cpp + udatintv.cpp + udatpg.cpp + ufieldpositer.cpp + uitercollationiterator.cpp + ulistformatter.cpp + umsg.cpp + unesctrn.cpp + uni2name.cpp + units_complexconverter.cpp + units_converter.cpp + units_data.cpp + units_router.cpp + unum.cpp + unumsys.cpp + uplrule.cpp + upluralrules.cpp + uregex.cpp + uregexc.cpp + uregion.cpp + usearch.cpp + uspoof.cpp + uspoof_build.cpp + uspoof_conf.cpp + uspoof_impl.cpp + utf16collationiterator.cpp + utf8collationiterator.cpp + utmscale.cpp + utrans.cpp + vtzone.cpp + vzone.cpp + windtfmt.cpp + winnmfmt.cpp + wintzimpl.cpp + zonemeta.cpp + zrule.cpp + ztrans.cpp) diff --git a/icuSources/i18n/alphaindex.cpp b/icuSources/i18n/alphaindex.cpp index 16b9d99..ab857fb 100644 --- a/icuSources/i18n/alphaindex.cpp +++ b/icuSources/i18n/alphaindex.cpp @@ -7,21 +7,21 @@ ******************************************************************************* */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_COLLATION -#include "unicode/alphaindex.h" -#include "unicode/coll.h" -#include "unicode/localpointer.h" -#include "unicode/normalizer2.h" -#include "unicode/tblcoll.h" -#include "unicode/uchar.h" -#include "unicode/ulocdata.h" -#include "unicode/uniset.h" -#include "unicode/uobject.h" -#include "unicode/usetiter.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/alphaindex.h> +#include <_foundation_unicode/coll.h> +#include <_foundation_unicode/localpointer.h> +#include <_foundation_unicode/normalizer2.h> +#include <_foundation_unicode/tblcoll.h> +#include <_foundation_unicode/uchar.h> +#include <_foundation_unicode/ulocdata.h> +#include <_foundation_unicode/uniset.h> +#include <_foundation_unicode/uobject.h> +#include <_foundation_unicode/usetiter.h> +#include <_foundation_unicode/utf16.h> #include "cmemory.h" #include "cstring.h" diff --git a/icuSources/i18n/anytrans.cpp b/icuSources/i18n/anytrans.cpp index e10ff47..94b90bc 100644 --- a/icuSources/i18n/anytrans.cpp +++ b/icuSources/i18n/anytrans.cpp @@ -10,12 +10,12 @@ ***************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_TRANSLITERATION -#include "unicode/uobject.h" -#include "unicode/uscript.h" +#include <_foundation_unicode/uobject.h> +#include <_foundation_unicode/uscript.h> #include "anytrans.h" #include "hash.h" diff --git a/icuSources/i18n/anytrans.h b/icuSources/i18n/anytrans.h index 67ebb2e..767c59c 100644 --- a/icuSources/i18n/anytrans.h +++ b/icuSources/i18n/anytrans.h @@ -12,12 +12,12 @@ #ifndef _ANYTRANS_H_ #define _ANYTRANS_H_ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_TRANSLITERATION -#include "unicode/translit.h" -#include "unicode/uscript.h" +#include <_foundation_unicode/translit.h> +#include <_foundation_unicode/uscript.h> #include "uhash.h" U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/astro.cpp b/icuSources/i18n/astro.cpp index b6f45ab..6a50f84 100644 --- a/icuSources/i18n/astro.cpp +++ b/icuSources/i18n/astro.cpp @@ -11,10 +11,10 @@ #if !UCONFIG_NO_FORMATTING -#include "unicode/calendar.h" +#include <_foundation_unicode/calendar.h> #include #include -#include "unicode/putil.h" +#include <_foundation_unicode/putil.h> #include "uhash.h" #include "umutex.h" #include "ucln_in.h" @@ -40,8 +40,8 @@ static void debug_astro_msg(const char *pat, ...) vfprintf(stderr, pat, ap); fflush(stderr); } -#include "unicode/datefmt.h" -#include "unicode/ustring.h" +#include <_foundation_unicode/datefmt.h> +#include <_foundation_unicode/ustring.h> static const char * debug_astro_date(UDate d) { static char gStrBuf[1024]; static DateFormat *df = NULL; diff --git a/icuSources/i18n/astro.h b/icuSources/i18n/astro.h index 4520d6c..646b4f6 100644 --- a/icuSources/i18n/astro.h +++ b/icuSources/i18n/astro.h @@ -10,12 +10,12 @@ #ifndef ASTRO_H #define ASTRO_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #include "gregoimp.h" // for Math -#include "unicode/unistr.h" +#include <_foundation_unicode/unistr.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/basictz.cpp b/icuSources/i18n/basictz.cpp index dfc3aea..027bf0f 100644 --- a/icuSources/i18n/basictz.cpp +++ b/icuSources/i18n/basictz.cpp @@ -7,11 +7,11 @@ ******************************************************************************* */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/basictz.h" +#include <_foundation_unicode/basictz.h> #include "gregoimp.h" #include "uvector.h" #include "cmemory.h" diff --git a/icuSources/i18n/bocsu.cpp b/icuSources/i18n/bocsu.cpp index 861a76a..4860684 100644 --- a/icuSources/i18n/bocsu.cpp +++ b/icuSources/i18n/bocsu.cpp @@ -17,12 +17,12 @@ */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_COLLATION -#include "unicode/bytestream.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/bytestream.h> +#include <_foundation_unicode/utf16.h> #include "bocsu.h" /* diff --git a/icuSources/i18n/bocsu.h b/icuSources/i18n/bocsu.h index 631e29a..795e3d7 100644 --- a/icuSources/i18n/bocsu.h +++ b/icuSources/i18n/bocsu.h @@ -19,7 +19,7 @@ #ifndef BOCSU_H #define BOCSU_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_COLLATION diff --git a/icuSources/i18n/brktrans.cpp b/icuSources/i18n/brktrans.cpp index f0ec840..ac46ba3 100644 --- a/icuSources/i18n/brktrans.cpp +++ b/icuSources/i18n/brktrans.cpp @@ -12,15 +12,15 @@ #include -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_TRANSLITERATION && !UCONFIG_NO_BREAK_ITERATION -#include "unicode/brkiter.h" -#include "unicode/localpointer.h" -#include "unicode/uchar.h" -#include "unicode/unifilt.h" -#include "unicode/uniset.h" +#include <_foundation_unicode/brkiter.h> +#include <_foundation_unicode/localpointer.h> +#include <_foundation_unicode/uchar.h> +#include <_foundation_unicode/unifilt.h> +#include <_foundation_unicode/uniset.h> #include "brktrans.h" #include "cmemory.h" diff --git a/icuSources/i18n/brktrans.h b/icuSources/i18n/brktrans.h index 5dcc8c5..81fb44c 100644 --- a/icuSources/i18n/brktrans.h +++ b/icuSources/i18n/brktrans.h @@ -12,13 +12,13 @@ #ifndef BRKTRANS_H #define BRKTRANS_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_TRANSLITERATION && !UCONFIG_NO_BREAK_ITERATION -#include "unicode/translit.h" +#include <_foundation_unicode/translit.h> -#include "unicode/localpointer.h" +#include <_foundation_unicode/localpointer.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/buddhcal.cpp b/icuSources/i18n/buddhcal.cpp index de30412..9d31a95 100644 --- a/icuSources/i18n/buddhcal.cpp +++ b/icuSources/i18n/buddhcal.cpp @@ -13,12 +13,12 @@ * */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #include "buddhcal.h" -#include "unicode/gregocal.h" +#include <_foundation_unicode/gregocal.h> #include "umutex.h" #include diff --git a/icuSources/i18n/buddhcal.h b/icuSources/i18n/buddhcal.h index 2ef5c52..3df0748 100644 --- a/icuSources/i18n/buddhcal.h +++ b/icuSources/i18n/buddhcal.h @@ -18,12 +18,12 @@ #ifndef BUDDHCAL_H #define BUDDHCAL_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/calendar.h" -#include "unicode/gregocal.h" +#include <_foundation_unicode/calendar.h> +#include <_foundation_unicode/gregocal.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/calendar.cpp b/icuSources/i18n/calendar.cpp index 805cf5a..9954f6b 100644 --- a/icuSources/i18n/calendar.cpp +++ b/icuSources/i18n/calendar.cpp @@ -28,15 +28,15 @@ #include "utypeinfo.h" // for 'typeid' to work -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/gregocal.h" -#include "unicode/basictz.h" -#include "unicode/simpletz.h" -#include "unicode/rbtz.h" -#include "unicode/vtzone.h" +#include <_foundation_unicode/gregocal.h> +#include <_foundation_unicode/basictz.h> +#include <_foundation_unicode/simpletz.h> +#include <_foundation_unicode/rbtz.h> +#include <_foundation_unicode/vtzone.h> #include "gregoimp.h" #include "buddhcal.h" #include "taiwncal.h" @@ -49,7 +49,7 @@ #include "coptccal.h" #include "dangical.h" #include "ethpccal.h" -#include "unicode/calendar.h" +#include <_foundation_unicode/calendar.h> #include "cpputils.h" #include "servloc.h" #include "ucln_in.h" diff --git a/icuSources/i18n/casetrn.cpp b/icuSources/i18n/casetrn.cpp index a065330..d74b0c9 100644 --- a/icuSources/i18n/casetrn.cpp +++ b/icuSources/i18n/casetrn.cpp @@ -18,14 +18,14 @@ * Implementation class for lower-/upper-/title-casing transliterators. */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_TRANSLITERATION -#include "unicode/uchar.h" -#include "unicode/ustring.h" -#include "unicode/utf.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/uchar.h> +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/utf.h> +#include <_foundation_unicode/utf16.h> #include "tolowtrn.h" #include "ucase.h" #include "cpputils.h" diff --git a/icuSources/i18n/casetrn.h b/icuSources/i18n/casetrn.h index a00480d..da3a06a 100644 --- a/icuSources/i18n/casetrn.h +++ b/icuSources/i18n/casetrn.h @@ -21,11 +21,11 @@ #ifndef __CASETRN_H__ #define __CASETRN_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_TRANSLITERATION -#include "unicode/translit.h" +#include <_foundation_unicode/translit.h> #include "ucase.h" U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/cecal.cpp b/icuSources/i18n/cecal.cpp index 60e3d4b..0a122e5 100644 --- a/icuSources/i18n/cecal.cpp +++ b/icuSources/i18n/cecal.cpp @@ -7,7 +7,7 @@ ******************************************************************************* */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING diff --git a/icuSources/i18n/cecal.h b/icuSources/i18n/cecal.h index 9ac71f6..37cd4e5 100644 --- a/icuSources/i18n/cecal.h +++ b/icuSources/i18n/cecal.h @@ -10,11 +10,11 @@ #ifndef CECAL_H #define CECAL_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/calendar.h" +#include <_foundation_unicode/calendar.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/chnsecal.cpp b/icuSources/i18n/chnsecal.cpp index 8ac9fa0..85b60dc 100644 --- a/icuSources/i18n/chnsecal.cpp +++ b/icuSources/i18n/chnsecal.cpp @@ -23,7 +23,7 @@ #include #include "gregoimp.h" // Math #include "astro.h" // CalendarAstronomer -#include "unicode/simpletz.h" +#include <_foundation_unicode/simpletz.h> #include "uhash.h" #include "ucln_in.h" diff --git a/icuSources/i18n/chnsecal.h b/icuSources/i18n/chnsecal.h index 488fe16..93ce31c 100644 --- a/icuSources/i18n/chnsecal.h +++ b/icuSources/i18n/chnsecal.h @@ -18,12 +18,12 @@ #ifndef CHNSECAL_H #define CHNSECAL_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/calendar.h" -#include "unicode/timezone.h" +#include <_foundation_unicode/calendar.h> +#include <_foundation_unicode/timezone.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/choicfmt.cpp b/icuSources/i18n/choicfmt.cpp index d06eec3..b33ef26 100644 --- a/icuSources/i18n/choicfmt.cpp +++ b/icuSources/i18n/choicfmt.cpp @@ -25,13 +25,13 @@ ******************************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/choicfmt.h" -#include "unicode/numfmt.h" -#include "unicode/locid.h" +#include <_foundation_unicode/choicfmt.h> +#include <_foundation_unicode/numfmt.h> +#include <_foundation_unicode/locid.h> #include "cpputils.h" #include "cstring.h" #include "messageimpl.h" diff --git a/icuSources/i18n/coleitr.cpp b/icuSources/i18n/coleitr.cpp index 0503950..eff53f3 100644 --- a/icuSources/i18n/coleitr.cpp +++ b/icuSources/i18n/coleitr.cpp @@ -25,14 +25,14 @@ * 2012-2014 markus Rewritten in C++ again. */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_COLLATION -#include "unicode/chariter.h" -#include "unicode/coleitr.h" -#include "unicode/tblcoll.h" -#include "unicode/ustring.h" +#include <_foundation_unicode/chariter.h> +#include <_foundation_unicode/coleitr.h> +#include <_foundation_unicode/tblcoll.h> +#include <_foundation_unicode/ustring.h> #include "cmemory.h" #include "collation.h" #include "collationdata.h" diff --git a/icuSources/i18n/coll.cpp b/icuSources/i18n/coll.cpp index 0a79705..9e221d9 100644 --- a/icuSources/i18n/coll.cpp +++ b/icuSources/i18n/coll.cpp @@ -42,12 +42,12 @@ #include "utypeinfo.h" // for 'typeid' to work -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_COLLATION -#include "unicode/coll.h" -#include "unicode/tblcoll.h" +#include <_foundation_unicode/coll.h> +#include <_foundation_unicode/tblcoll.h> #include "collationdata.h" #include "collationroot.h" #include "collationtailoring.h" diff --git a/icuSources/i18n/collation.cpp b/icuSources/i18n/collation.cpp index 705ee12..2b12196 100644 --- a/icuSources/i18n/collation.cpp +++ b/icuSources/i18n/collation.cpp @@ -11,7 +11,7 @@ * created by: Markus W. Scherer */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_COLLATION diff --git a/icuSources/i18n/collation.h b/icuSources/i18n/collation.h index 2062ef2..1d0c87f 100644 --- a/icuSources/i18n/collation.h +++ b/icuSources/i18n/collation.h @@ -14,7 +14,7 @@ #ifndef __COLLATION_H__ #define __COLLATION_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_COLLATION diff --git a/icuSources/i18n/collationbuilder.cpp b/icuSources/i18n/collationbuilder.cpp index fbf09a3..6a31ecb 100644 --- a/icuSources/i18n/collationbuilder.cpp +++ b/icuSources/i18n/collationbuilder.cpp @@ -17,20 +17,20 @@ #include #endif -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_COLLATION -#include "unicode/caniter.h" -#include "unicode/normalizer2.h" -#include "unicode/tblcoll.h" -#include "unicode/parseerr.h" -#include "unicode/uchar.h" -#include "unicode/ucol.h" -#include "unicode/unistr.h" -#include "unicode/usetiter.h" -#include "unicode/utf16.h" -#include "unicode/uversion.h" +#include <_foundation_unicode/caniter.h> +#include <_foundation_unicode/normalizer2.h> +#include <_foundation_unicode/tblcoll.h> +#include <_foundation_unicode/parseerr.h> +#include <_foundation_unicode/uchar.h> +#include <_foundation_unicode/ucol.h> +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/usetiter.h> +#include <_foundation_unicode/utf16.h> +#include <_foundation_unicode/uversion.h> #include "cmemory.h" #include "collation.h" #include "collationbuilder.h" diff --git a/icuSources/i18n/collationbuilder.h b/icuSources/i18n/collationbuilder.h index 22e24dd..ca8b1b9 100644 --- a/icuSources/i18n/collationbuilder.h +++ b/icuSources/i18n/collationbuilder.h @@ -14,12 +14,12 @@ #ifndef __COLLATIONBUILDER_H__ #define __COLLATIONBUILDER_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_COLLATION -#include "unicode/uniset.h" -#include "unicode/unistr.h" +#include <_foundation_unicode/uniset.h> +#include <_foundation_unicode/unistr.h> #include "collationrootelements.h" #include "collationruleparser.h" #include "uvectr32.h" diff --git a/icuSources/i18n/collationcompare.cpp b/icuSources/i18n/collationcompare.cpp index d9048af..fd31aeb 100644 --- a/icuSources/i18n/collationcompare.cpp +++ b/icuSources/i18n/collationcompare.cpp @@ -11,11 +11,11 @@ * created by: Markus W. Scherer */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_COLLATION -#include "unicode/ucol.h" +#include <_foundation_unicode/ucol.h> #include "cmemory.h" #include "collation.h" #include "collationcompare.h" diff --git a/icuSources/i18n/collationcompare.h b/icuSources/i18n/collationcompare.h index 6ad2d06..9b0bc6f 100644 --- a/icuSources/i18n/collationcompare.h +++ b/icuSources/i18n/collationcompare.h @@ -14,11 +14,11 @@ #ifndef __COLLATIONCOMPARE_H__ #define __COLLATIONCOMPARE_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_COLLATION -#include "unicode/ucol.h" +#include <_foundation_unicode/ucol.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/collationdata.cpp b/icuSources/i18n/collationdata.cpp index 1b8b6a7..33e08da 100644 --- a/icuSources/i18n/collationdata.cpp +++ b/icuSources/i18n/collationdata.cpp @@ -11,13 +11,13 @@ * created by: Markus W. Scherer */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_COLLATION -#include "unicode/ucol.h" -#include "unicode/udata.h" -#include "unicode/uscript.h" +#include <_foundation_unicode/ucol.h> +#include <_foundation_unicode/udata.h> +#include <_foundation_unicode/uscript.h> #include "cmemory.h" #include "collation.h" #include "collationdata.h" diff --git a/icuSources/i18n/collationdata.h b/icuSources/i18n/collationdata.h index 71bf17a..a705088 100644 --- a/icuSources/i18n/collationdata.h +++ b/icuSources/i18n/collationdata.h @@ -14,12 +14,12 @@ #ifndef __COLLATIONDATA_H__ #define __COLLATIONDATA_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_COLLATION -#include "unicode/ucol.h" -#include "unicode/uniset.h" +#include <_foundation_unicode/ucol.h> +#include <_foundation_unicode/uniset.h> #include "collation.h" #include "normalizer2impl.h" #include "utrie2.h" diff --git a/icuSources/i18n/collationdatabuilder.cpp b/icuSources/i18n/collationdatabuilder.cpp index e7c3da1..15dae6e 100644 --- a/icuSources/i18n/collationdatabuilder.cpp +++ b/icuSources/i18n/collationdatabuilder.cpp @@ -13,18 +13,18 @@ * created by: Markus W. Scherer */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_COLLATION -#include "unicode/localpointer.h" -#include "unicode/uchar.h" -#include "unicode/ucharstrie.h" -#include "unicode/ucharstriebuilder.h" -#include "unicode/uniset.h" -#include "unicode/unistr.h" -#include "unicode/usetiter.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/localpointer.h> +#include <_foundation_unicode/uchar.h> +#include <_foundation_unicode/ucharstrie.h> +#include <_foundation_unicode/ucharstriebuilder.h> +#include <_foundation_unicode/uniset.h> +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/usetiter.h> +#include <_foundation_unicode/utf16.h> #include "cmemory.h" #include "collation.h" #include "collationdata.h" diff --git a/icuSources/i18n/collationdatabuilder.h b/icuSources/i18n/collationdatabuilder.h index cbbd8f2..5ce0377 100644 --- a/icuSources/i18n/collationdatabuilder.h +++ b/icuSources/i18n/collationdatabuilder.h @@ -14,13 +14,13 @@ #ifndef __COLLATIONDATABUILDER_H__ #define __COLLATIONDATABUILDER_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_COLLATION -#include "unicode/uniset.h" -#include "unicode/unistr.h" -#include "unicode/uversion.h" +#include <_foundation_unicode/uniset.h> +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/uversion.h> #include "collation.h" #include "collationdata.h" #include "collationsettings.h" diff --git a/icuSources/i18n/collationdatareader.cpp b/icuSources/i18n/collationdatareader.cpp index a96982c..50e50fc 100644 --- a/icuSources/i18n/collationdatareader.cpp +++ b/icuSources/i18n/collationdatareader.cpp @@ -11,13 +11,13 @@ * created by: Markus W. Scherer */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_COLLATION -#include "unicode/ucol.h" -#include "unicode/udata.h" -#include "unicode/uscript.h" +#include <_foundation_unicode/ucol.h> +#include <_foundation_unicode/udata.h> +#include <_foundation_unicode/uscript.h> #include "cmemory.h" #include "collation.h" #include "collationdata.h" diff --git a/icuSources/i18n/collationdatareader.h b/icuSources/i18n/collationdatareader.h index 083b57e..47ecb90 100644 --- a/icuSources/i18n/collationdatareader.h +++ b/icuSources/i18n/collationdatareader.h @@ -14,11 +14,11 @@ #ifndef __COLLATIONDATAREADER_H__ #define __COLLATIONDATAREADER_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_COLLATION -#include "unicode/udata.h" +#include <_foundation_unicode/udata.h> struct UDataMemory; @@ -117,7 +117,7 @@ struct U_I18N_API CollationDataReader /* all static */ { * Tailorings are stored inside .res resource bundle files, with a complete file header. * * Collation data begins with a standard ICU data file header - * (DataHeader, see ucmndata.h and unicode/udata.h). + * (DataHeader, see ucmndata.h and _foundation_unicode/udata.h). * The UDataInfo.dataVersion field contains the UCA and other version numbers, * see the comments for CollationTailoring.version. * diff --git a/icuSources/i18n/collationdatawriter.cpp b/icuSources/i18n/collationdatawriter.cpp index b4be7df..fe66d3a 100644 --- a/icuSources/i18n/collationdatawriter.cpp +++ b/icuSources/i18n/collationdatawriter.cpp @@ -11,13 +11,13 @@ * created by: Markus W. Scherer */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_COLLATION -#include "unicode/tblcoll.h" -#include "unicode/udata.h" -#include "unicode/uniset.h" +#include <_foundation_unicode/tblcoll.h> +#include <_foundation_unicode/udata.h> +#include <_foundation_unicode/uniset.h> #include "cmemory.h" #include "collationdata.h" #include "collationdatabuilder.h" diff --git a/icuSources/i18n/collationdatawriter.h b/icuSources/i18n/collationdatawriter.h index 6ba9a9c..f829fea 100644 --- a/icuSources/i18n/collationdatawriter.h +++ b/icuSources/i18n/collationdatawriter.h @@ -14,7 +14,7 @@ #ifndef __COLLATIONDATAWRITER_H__ #define __COLLATIONDATAWRITER_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_COLLATION diff --git a/icuSources/i18n/collationfastlatin.cpp b/icuSources/i18n/collationfastlatin.cpp index 35cf60e..1ae3f23 100644 --- a/icuSources/i18n/collationfastlatin.cpp +++ b/icuSources/i18n/collationfastlatin.cpp @@ -11,11 +11,11 @@ * created by: Markus W. Scherer */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_COLLATION -#include "unicode/ucol.h" +#include <_foundation_unicode/ucol.h> #include "collationdata.h" #include "collationfastlatin.h" #include "collationsettings.h" diff --git a/icuSources/i18n/collationfastlatin.h b/icuSources/i18n/collationfastlatin.h index 7013f71..20a966b 100644 --- a/icuSources/i18n/collationfastlatin.h +++ b/icuSources/i18n/collationfastlatin.h @@ -14,7 +14,7 @@ #ifndef __COLLATIONFASTLATIN_H__ #define __COLLATIONFASTLATIN_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_COLLATION diff --git a/icuSources/i18n/collationfastlatinbuilder.cpp b/icuSources/i18n/collationfastlatinbuilder.cpp index fc50e9d..6b5316f 100644 --- a/icuSources/i18n/collationfastlatinbuilder.cpp +++ b/icuSources/i18n/collationfastlatinbuilder.cpp @@ -17,15 +17,15 @@ #include #endif -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_COLLATION -#include "unicode/ucol.h" -#include "unicode/ucharstrie.h" -#include "unicode/unistr.h" -#include "unicode/uobject.h" -#include "unicode/uscript.h" +#include <_foundation_unicode/ucol.h> +#include <_foundation_unicode/ucharstrie.h> +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/uobject.h> +#include <_foundation_unicode/uscript.h> #include "cmemory.h" #include "collation.h" #include "collationdata.h" diff --git a/icuSources/i18n/collationfastlatinbuilder.h b/icuSources/i18n/collationfastlatinbuilder.h index 8b63b86..1138f19 100644 --- a/icuSources/i18n/collationfastlatinbuilder.h +++ b/icuSources/i18n/collationfastlatinbuilder.h @@ -14,13 +14,13 @@ #ifndef __COLLATIONFASTLATINBUILDER_H__ #define __COLLATIONFASTLATINBUILDER_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_COLLATION -#include "unicode/ucol.h" -#include "unicode/unistr.h" -#include "unicode/uobject.h" +#include <_foundation_unicode/ucol.h> +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/uobject.h> #include "collation.h" #include "collationfastlatin.h" #include "uvectr64.h" diff --git a/icuSources/i18n/collationfcd.cpp b/icuSources/i18n/collationfcd.cpp index e1f1d03..e21204b 100644 --- a/icuSources/i18n/collationfcd.cpp +++ b/icuSources/i18n/collationfcd.cpp @@ -7,7 +7,7 @@ // // machine-generated by: icu/tools/unicode/c/genuca/genuca.cpp -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_COLLATION diff --git a/icuSources/i18n/collationfcd.h b/icuSources/i18n/collationfcd.h index 9620452..c41de37 100644 --- a/icuSources/i18n/collationfcd.h +++ b/icuSources/i18n/collationfcd.h @@ -14,11 +14,11 @@ #ifndef __COLLATIONFCD_H__ #define __COLLATIONFCD_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_COLLATION -#include "unicode/utf16.h" +#include <_foundation_unicode/utf16.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/collationiterator.cpp b/icuSources/i18n/collationiterator.cpp index a47b3d8..5617e0f 100644 --- a/icuSources/i18n/collationiterator.cpp +++ b/icuSources/i18n/collationiterator.cpp @@ -13,12 +13,12 @@ #include "utypeinfo.h" // for 'typeid' to work -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_COLLATION -#include "unicode/ucharstrie.h" -#include "unicode/ustringtrie.h" +#include <_foundation_unicode/ucharstrie.h> +#include <_foundation_unicode/ustringtrie.h> #include "charstr.h" #include "cmemory.h" #include "collation.h" diff --git a/icuSources/i18n/collationiterator.h b/icuSources/i18n/collationiterator.h index 93c119c..92483c8 100644 --- a/icuSources/i18n/collationiterator.h +++ b/icuSources/i18n/collationiterator.h @@ -14,7 +14,7 @@ #ifndef __COLLATIONITERATOR_H__ #define __COLLATIONITERATOR_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_COLLATION diff --git a/icuSources/i18n/collationkeys.cpp b/icuSources/i18n/collationkeys.cpp index c7e0de6..67a50f2 100644 --- a/icuSources/i18n/collationkeys.cpp +++ b/icuSources/i18n/collationkeys.cpp @@ -11,11 +11,11 @@ * created by: Markus W. Scherer */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_COLLATION -#include "unicode/bytestream.h" +#include <_foundation_unicode/bytestream.h> #include "collation.h" #include "collationiterator.h" #include "collationkeys.h" diff --git a/icuSources/i18n/collationkeys.h b/icuSources/i18n/collationkeys.h index 8dad286..a6a78b1 100644 --- a/icuSources/i18n/collationkeys.h +++ b/icuSources/i18n/collationkeys.h @@ -14,12 +14,12 @@ #ifndef __COLLATIONKEYS_H__ #define __COLLATIONKEYS_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_COLLATION -#include "unicode/bytestream.h" -#include "unicode/ucol.h" +#include <_foundation_unicode/bytestream.h> +#include <_foundation_unicode/ucol.h> #include "charstr.h" #include "collation.h" diff --git a/icuSources/i18n/collationroot.cpp b/icuSources/i18n/collationroot.cpp index dc88c35..d9ed70b 100644 --- a/icuSources/i18n/collationroot.cpp +++ b/icuSources/i18n/collationroot.cpp @@ -11,12 +11,12 @@ * created by: Markus W. Scherer */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_COLLATION -#include "unicode/coll.h" -#include "unicode/udata.h" +#include <_foundation_unicode/coll.h> +#include <_foundation_unicode/udata.h> #include "collation.h" #include "collationdata.h" #include "collationdatareader.h" diff --git a/icuSources/i18n/collationroot.h b/icuSources/i18n/collationroot.h index b203f61..ae145a8 100644 --- a/icuSources/i18n/collationroot.h +++ b/icuSources/i18n/collationroot.h @@ -14,8 +14,8 @@ #ifndef __COLLATIONROOT_H__ #define __COLLATIONROOT_H__ -#include "unicode/utypes.h" -#include "unicode/udata.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/udata.h> #if !UCONFIG_NO_COLLATION diff --git a/icuSources/i18n/collationrootelements.cpp b/icuSources/i18n/collationrootelements.cpp index 9b46d14..54296d0 100644 --- a/icuSources/i18n/collationrootelements.cpp +++ b/icuSources/i18n/collationrootelements.cpp @@ -11,7 +11,7 @@ * created by: Markus W. Scherer */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_COLLATION diff --git a/icuSources/i18n/collationrootelements.h b/icuSources/i18n/collationrootelements.h index 7836d8d..259c9e4 100644 --- a/icuSources/i18n/collationrootelements.h +++ b/icuSources/i18n/collationrootelements.h @@ -14,11 +14,11 @@ #ifndef __COLLATIONROOTELEMENTS_H__ #define __COLLATIONROOTELEMENTS_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_COLLATION -#include "unicode/uobject.h" +#include <_foundation_unicode/uobject.h> #include "collation.h" U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/collationruleparser.cpp b/icuSources/i18n/collationruleparser.cpp index a2b373f..a9918fd 100644 --- a/icuSources/i18n/collationruleparser.cpp +++ b/icuSources/i18n/collationruleparser.cpp @@ -13,17 +13,17 @@ * created by: Markus W. Scherer */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_COLLATION -#include "unicode/normalizer2.h" -#include "unicode/parseerr.h" -#include "unicode/uchar.h" -#include "unicode/ucol.h" -#include "unicode/uloc.h" -#include "unicode/unistr.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/normalizer2.h> +#include <_foundation_unicode/parseerr.h> +#include <_foundation_unicode/uchar.h> +#include <_foundation_unicode/ucol.h> +#include <_foundation_unicode/uloc.h> +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/utf16.h> #include "charstr.h" #include "cmemory.h" #include "collation.h" diff --git a/icuSources/i18n/collationruleparser.h b/icuSources/i18n/collationruleparser.h index e124881..8694773 100644 --- a/icuSources/i18n/collationruleparser.h +++ b/icuSources/i18n/collationruleparser.h @@ -14,13 +14,13 @@ #ifndef __COLLATIONRULEPARSER_H__ #define __COLLATIONRULEPARSER_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_COLLATION -#include "unicode/ucol.h" -#include "unicode/uniset.h" -#include "unicode/unistr.h" +#include <_foundation_unicode/ucol.h> +#include <_foundation_unicode/uniset.h> +#include <_foundation_unicode/unistr.h> struct UParseError; diff --git a/icuSources/i18n/collationsets.cpp b/icuSources/i18n/collationsets.cpp index b23c5e3..051144f 100644 --- a/icuSources/i18n/collationsets.cpp +++ b/icuSources/i18n/collationsets.cpp @@ -11,14 +11,14 @@ * created by: Markus W. Scherer */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_COLLATION -#include "unicode/ucharstrie.h" -#include "unicode/uniset.h" -#include "unicode/unistr.h" -#include "unicode/ustringtrie.h" +#include <_foundation_unicode/ucharstrie.h> +#include <_foundation_unicode/uniset.h> +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/ustringtrie.h> #include "collation.h" #include "collationdata.h" #include "collationsets.h" diff --git a/icuSources/i18n/collationsets.h b/icuSources/i18n/collationsets.h index aed41f7..41516ce 100644 --- a/icuSources/i18n/collationsets.h +++ b/icuSources/i18n/collationsets.h @@ -14,11 +14,11 @@ #ifndef __COLLATIONSETS_H__ #define __COLLATIONSETS_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_COLLATION -#include "unicode/uniset.h" +#include <_foundation_unicode/uniset.h> #include "collation.h" U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/collationsettings.cpp b/icuSources/i18n/collationsettings.cpp index fe05188..85f3660 100644 --- a/icuSources/i18n/collationsettings.cpp +++ b/icuSources/i18n/collationsettings.cpp @@ -11,11 +11,11 @@ * created by: Markus W. Scherer */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_COLLATION -#include "unicode/ucol.h" +#include <_foundation_unicode/ucol.h> #include "cmemory.h" #include "collation.h" #include "collationdata.h" diff --git a/icuSources/i18n/collationsettings.h b/icuSources/i18n/collationsettings.h index 3da8f62..de4d456 100644 --- a/icuSources/i18n/collationsettings.h +++ b/icuSources/i18n/collationsettings.h @@ -14,11 +14,11 @@ #ifndef __COLLATIONSETTINGS_H__ #define __COLLATIONSETTINGS_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_COLLATION -#include "unicode/ucol.h" +#include <_foundation_unicode/ucol.h> #include "collation.h" #include "sharedobject.h" #include "umutex.h" diff --git a/icuSources/i18n/collationtailoring.cpp b/icuSources/i18n/collationtailoring.cpp index 440414c..cbca06b 100644 --- a/icuSources/i18n/collationtailoring.cpp +++ b/icuSources/i18n/collationtailoring.cpp @@ -11,15 +11,15 @@ * created by: Markus W. Scherer */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_COLLATION -#include "unicode/udata.h" -#include "unicode/unistr.h" -#include "unicode/ures.h" -#include "unicode/uversion.h" -#include "unicode/uvernum.h" +#include <_foundation_unicode/udata.h> +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/ures.h> +#include <_foundation_unicode/uversion.h> +#include <_foundation_unicode/uvernum.h> #include "cmemory.h" #include "collationdata.h" #include "collationsettings.h" diff --git a/icuSources/i18n/collationtailoring.h b/icuSources/i18n/collationtailoring.h index a6143c1..714ee17 100644 --- a/icuSources/i18n/collationtailoring.h +++ b/icuSources/i18n/collationtailoring.h @@ -14,13 +14,13 @@ #ifndef __COLLATIONTAILORING_H__ #define __COLLATIONTAILORING_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_COLLATION -#include "unicode/locid.h" -#include "unicode/unistr.h" -#include "unicode/uversion.h" +#include <_foundation_unicode/locid.h> +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/uversion.h> #include "collationsettings.h" #include "uhash.h" #include "umutex.h" diff --git a/icuSources/i18n/collationweights.cpp b/icuSources/i18n/collationweights.cpp index 02d0268..9ad79c4 100644 --- a/icuSources/i18n/collationweights.cpp +++ b/icuSources/i18n/collationweights.cpp @@ -20,7 +20,7 @@ * It is used only internally by the collation tailoring builder. */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_COLLATION diff --git a/icuSources/i18n/collationweights.h b/icuSources/i18n/collationweights.h index 0d20b92..f0ea1a9 100644 --- a/icuSources/i18n/collationweights.h +++ b/icuSources/i18n/collationweights.h @@ -19,11 +19,11 @@ #ifndef __COLLATIONWEIGHTS_H__ #define __COLLATIONWEIGHTS_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_COLLATION -#include "unicode/uobject.h" +#include <_foundation_unicode/uobject.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/collunsafe.h b/icuSources/i18n/collunsafe.h index 0767254..b3ef4ad 100644 --- a/icuSources/i18n/collunsafe.h +++ b/icuSources/i18n/collunsafe.h @@ -10,7 +10,7 @@ #ifndef COLLUNSAFE_H #define COLLUNSAFE_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #define COLLUNSAFE_ICU_VERSION "56.0.1" #define COLLUNSAFE_COLL_VERSION "9.64" diff --git a/icuSources/i18n/compactdecimalformat.cpp b/icuSources/i18n/compactdecimalformat.cpp index a4c9dad..1cce325 100644 --- a/icuSources/i18n/compactdecimalformat.cpp +++ b/icuSources/i18n/compactdecimalformat.cpp @@ -1,7 +1,7 @@ // © 2018 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING @@ -9,7 +9,7 @@ // Helpful in toString methods and elsewhere. #define UNISTR_FROM_STRING_EXPLICIT -#include "unicode/compactdecimalformat.h" +#include <_foundation_unicode/compactdecimalformat.h> #include "number_mapper.h" #include "number_decimfmtprops.h" diff --git a/icuSources/i18n/coptccal.cpp b/icuSources/i18n/coptccal.cpp index 0be700c..f4faa22 100644 --- a/icuSources/i18n/coptccal.cpp +++ b/icuSources/i18n/coptccal.cpp @@ -7,7 +7,7 @@ ******************************************************************************* */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING diff --git a/icuSources/i18n/coptccal.h b/icuSources/i18n/coptccal.h index 5c51af0..71a9d60 100644 --- a/icuSources/i18n/coptccal.h +++ b/icuSources/i18n/coptccal.h @@ -10,11 +10,11 @@ #ifndef COPTCCAL_H #define COPTCCAL_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/calendar.h" +#include <_foundation_unicode/calendar.h> #include "cecal.h" U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/cpdtrans.cpp b/icuSources/i18n/cpdtrans.cpp index f2b1c36..839312c 100644 --- a/icuSources/i18n/cpdtrans.cpp +++ b/icuSources/i18n/cpdtrans.cpp @@ -10,12 +10,12 @@ ********************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_TRANSLITERATION -#include "unicode/unifilt.h" -#include "unicode/uniset.h" +#include <_foundation_unicode/unifilt.h> +#include <_foundation_unicode/uniset.h> #include "cpdtrans.h" #include "uvector.h" #include "tridpars.h" diff --git a/icuSources/i18n/cpdtrans.h b/icuSources/i18n/cpdtrans.h index af60cb8..6d17c29 100644 --- a/icuSources/i18n/cpdtrans.h +++ b/icuSources/i18n/cpdtrans.h @@ -12,11 +12,11 @@ #ifndef CPDTRANS_H #define CPDTRANS_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_TRANSLITERATION -#include "unicode/translit.h" +#include <_foundation_unicode/translit.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/csdetect.cpp b/icuSources/i18n/csdetect.cpp index 0b22d4d..8248927 100644 --- a/icuSources/i18n/csdetect.cpp +++ b/icuSources/i18n/csdetect.cpp @@ -7,11 +7,11 @@ ********************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_CONVERSION -#include "unicode/ucsdet.h" +#include <_foundation_unicode/ucsdet.h> #include "csdetect.h" #include "csmatch.h" diff --git a/icuSources/i18n/csdetect.h b/icuSources/i18n/csdetect.h index d4bfa75..66de7cd 100644 --- a/icuSources/i18n/csdetect.h +++ b/icuSources/i18n/csdetect.h @@ -10,11 +10,11 @@ #ifndef __CSDETECT_H #define __CSDETECT_H -#include "unicode/uobject.h" +#include <_foundation_unicode/uobject.h> #if !UCONFIG_NO_CONVERSION -#include "unicode/uenum.h" +#include <_foundation_unicode/uenum.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/csmatch.cpp b/icuSources/i18n/csmatch.cpp index 83bf531..ed2af4e 100644 --- a/icuSources/i18n/csmatch.cpp +++ b/icuSources/i18n/csmatch.cpp @@ -7,11 +7,11 @@ ********************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_CONVERSION -#include "unicode/unistr.h" -#include "unicode/ucnv.h" +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/ucnv.h> #include "csmatch.h" diff --git a/icuSources/i18n/csmatch.h b/icuSources/i18n/csmatch.h index fe379ce..6f3c815 100644 --- a/icuSources/i18n/csmatch.h +++ b/icuSources/i18n/csmatch.h @@ -10,7 +10,7 @@ #ifndef __CSMATCH_H #define __CSMATCH_H -#include "unicode/uobject.h" +#include <_foundation_unicode/uobject.h> #if !UCONFIG_NO_CONVERSION diff --git a/icuSources/i18n/csr2022.cpp b/icuSources/i18n/csr2022.cpp index e064c42..1bf7df2 100644 --- a/icuSources/i18n/csr2022.cpp +++ b/icuSources/i18n/csr2022.cpp @@ -7,7 +7,7 @@ ********************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_CONVERSION diff --git a/icuSources/i18n/csr2022.h b/icuSources/i18n/csr2022.h index 4418728..3f6e660 100644 --- a/icuSources/i18n/csr2022.h +++ b/icuSources/i18n/csr2022.h @@ -10,7 +10,7 @@ #ifndef __CSR2022_H #define __CSR2022_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_CONVERSION diff --git a/icuSources/i18n/csrecog.cpp b/icuSources/i18n/csrecog.cpp index 31fce5d..55723bc 100644 --- a/icuSources/i18n/csrecog.cpp +++ b/icuSources/i18n/csrecog.cpp @@ -7,7 +7,7 @@ ********************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_CONVERSION diff --git a/icuSources/i18n/csrecog.h b/icuSources/i18n/csrecog.h index 944a500..abd3168 100644 --- a/icuSources/i18n/csrecog.h +++ b/icuSources/i18n/csrecog.h @@ -10,7 +10,7 @@ #ifndef __CSRECOG_H #define __CSRECOG_H -#include "unicode/uobject.h" +#include <_foundation_unicode/uobject.h> #if !UCONFIG_NO_CONVERSION diff --git a/icuSources/i18n/csrmbcs.cpp b/icuSources/i18n/csrmbcs.cpp index 79fc9c9..564cd47 100644 --- a/icuSources/i18n/csrmbcs.cpp +++ b/icuSources/i18n/csrmbcs.cpp @@ -7,7 +7,7 @@ ********************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_CONVERSION diff --git a/icuSources/i18n/csrmbcs.h b/icuSources/i18n/csrmbcs.h index 3c58718..d115a9e 100644 --- a/icuSources/i18n/csrmbcs.h +++ b/icuSources/i18n/csrmbcs.h @@ -10,7 +10,7 @@ #ifndef __CSRMBCS_H #define __CSRMBCS_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_CONVERSION diff --git a/icuSources/i18n/csrsbcs.cpp b/icuSources/i18n/csrsbcs.cpp index 1f5ddb0..c9d73b0 100644 --- a/icuSources/i18n/csrsbcs.cpp +++ b/icuSources/i18n/csrsbcs.cpp @@ -7,7 +7,7 @@ ********************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #include "cmemory.h" diff --git a/icuSources/i18n/csrsbcs.h b/icuSources/i18n/csrsbcs.h index 96f982c..776cca4 100644 --- a/icuSources/i18n/csrsbcs.h +++ b/icuSources/i18n/csrsbcs.h @@ -10,7 +10,7 @@ #ifndef __CSRSBCS_H #define __CSRSBCS_H -#include "unicode/uobject.h" +#include <_foundation_unicode/uobject.h> #if !UCONFIG_NO_CONVERSION diff --git a/icuSources/i18n/csrucode.cpp b/icuSources/i18n/csrucode.cpp index e0a64aa..1e951da 100644 --- a/icuSources/i18n/csrucode.cpp +++ b/icuSources/i18n/csrucode.cpp @@ -7,7 +7,7 @@ ********************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_CONVERSION diff --git a/icuSources/i18n/csrucode.h b/icuSources/i18n/csrucode.h index 78e08d2..06023b5 100644 --- a/icuSources/i18n/csrucode.h +++ b/icuSources/i18n/csrucode.h @@ -10,7 +10,7 @@ #ifndef __CSRUCODE_H #define __CSRUCODE_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_CONVERSION diff --git a/icuSources/i18n/csrutf8.cpp b/icuSources/i18n/csrutf8.cpp index f114f09..2695fe2 100644 --- a/icuSources/i18n/csrutf8.cpp +++ b/icuSources/i18n/csrutf8.cpp @@ -7,7 +7,7 @@ ********************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_CONVERSION diff --git a/icuSources/i18n/csrutf8.h b/icuSources/i18n/csrutf8.h index bcfb38a..821897b 100644 --- a/icuSources/i18n/csrutf8.h +++ b/icuSources/i18n/csrutf8.h @@ -10,7 +10,7 @@ #ifndef __CSRUTF8_H #define __CSRUTF8_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_CONVERSION diff --git a/icuSources/i18n/curramt.cpp b/icuSources/i18n/curramt.cpp index 6fd2ea2..2a46258 100644 --- a/icuSources/i18n/curramt.cpp +++ b/icuSources/i18n/curramt.cpp @@ -10,12 +10,12 @@ * Since: ICU 3.0 ********************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/curramt.h" -#include "unicode/currunit.h" +#include <_foundation_unicode/curramt.h> +#include <_foundation_unicode/currunit.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/currfmt.cpp b/icuSources/i18n/currfmt.cpp index 0ad0492..e2abff8 100644 --- a/icuSources/i18n/currfmt.cpp +++ b/icuSources/i18n/currfmt.cpp @@ -10,13 +10,13 @@ * Since: ICU 3.0 ********************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #include "currfmt.h" -#include "unicode/numfmt.h" -#include "unicode/curramt.h" +#include <_foundation_unicode/numfmt.h> +#include <_foundation_unicode/curramt.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/currfmt.h b/icuSources/i18n/currfmt.h index 2a75cae..cc5e10e 100644 --- a/icuSources/i18n/currfmt.h +++ b/icuSources/i18n/currfmt.h @@ -13,11 +13,11 @@ #ifndef CURRENCYFORMAT_H #define CURRENCYFORMAT_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/measfmt.h" +#include <_foundation_unicode/measfmt.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/currpinf.cpp b/icuSources/i18n/currpinf.cpp index 1a1c580..b1092f2 100644 --- a/icuSources/i18n/currpinf.cpp +++ b/icuSources/i18n/currpinf.cpp @@ -7,7 +7,7 @@ ******************************************************************************* */ -#include "unicode/currpinf.h" +#include <_foundation_unicode/currpinf.h> #if !UCONFIG_NO_FORMATTING @@ -17,11 +17,11 @@ #include #endif -#include "unicode/locid.h" -#include "unicode/plurrule.h" -#include "unicode/strenum.h" -#include "unicode/ures.h" -#include "unicode/numsys.h" +#include <_foundation_unicode/locid.h> +#include <_foundation_unicode/plurrule.h> +#include <_foundation_unicode/strenum.h> +#include <_foundation_unicode/ures.h> +#include <_foundation_unicode/numsys.h> #include "cstring.h" #include "hash.h" #include "uresimp.h" diff --git a/icuSources/i18n/currunit.cpp b/icuSources/i18n/currunit.cpp index 92bcf12..9cbdfce 100644 --- a/icuSources/i18n/currunit.cpp +++ b/icuSources/i18n/currunit.cpp @@ -10,13 +10,13 @@ * Since: ICU 3.0 ********************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/currunit.h" -#include "unicode/ustring.h" -#include "unicode/uchar.h" +#include <_foundation_unicode/currunit.h> +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/uchar.h> #include "cstring.h" #include "uinvchar.h" #include "charstr.h" diff --git a/icuSources/i18n/dangical.cpp b/icuSources/i18n/dangical.cpp index 59cdc66..4bac9ae 100644 --- a/icuSources/i18n/dangical.cpp +++ b/icuSources/i18n/dangical.cpp @@ -19,8 +19,8 @@ #include "uassert.h" #include "ucln_in.h" #include "umutex.h" -#include "unicode/rbtz.h" -#include "unicode/tzrule.h" +#include <_foundation_unicode/rbtz.h> +#include <_foundation_unicode/tzrule.h> // --- The cache -- static icu::TimeZone *gDangiCalendarZoneAstroCalc = NULL; diff --git a/icuSources/i18n/dangical.h b/icuSources/i18n/dangical.h index 9d04372..6512a43 100644 --- a/icuSources/i18n/dangical.h +++ b/icuSources/i18n/dangical.h @@ -13,12 +13,12 @@ #ifndef DANGICAL_H #define DANGICAL_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/calendar.h" -#include "unicode/timezone.h" +#include <_foundation_unicode/calendar.h> +#include <_foundation_unicode/timezone.h> #include "chnsecal.h" U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/datefmt.cpp b/icuSources/i18n/datefmt.cpp index 6509c05..02de4e6 100644 --- a/icuSources/i18n/datefmt.cpp +++ b/icuSources/i18n/datefmt.cpp @@ -19,15 +19,15 @@ ******************************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/ures.h" -#include "unicode/datefmt.h" -#include "unicode/smpdtfmt.h" -#include "unicode/dtptngen.h" -#include "unicode/udisplaycontext.h" +#include <_foundation_unicode/ures.h> +#include <_foundation_unicode/datefmt.h> +#include <_foundation_unicode/smpdtfmt.h> +#include <_foundation_unicode/dtptngen.h> +#include <_foundation_unicode/udisplaycontext.h> #include "reldtfmt.h" #include "sharedobject.h" #include "unifiedcache.h" diff --git a/icuSources/i18n/dayperiodrules.cpp b/icuSources/i18n/dayperiodrules.cpp index 3ef8228..b6af2fc 100644 --- a/icuSources/i18n/dayperiodrules.cpp +++ b/icuSources/i18n/dayperiodrules.cpp @@ -13,7 +13,7 @@ #include "dayperiodrules.h" -#include "unicode/ures.h" +#include <_foundation_unicode/ures.h> #include "charstr.h" #include "cstring.h" #include "ucln_in.h" diff --git a/icuSources/i18n/dayperiodrules.h b/icuSources/i18n/dayperiodrules.h index 4bfca76..db1652d 100644 --- a/icuSources/i18n/dayperiodrules.h +++ b/icuSources/i18n/dayperiodrules.h @@ -14,10 +14,10 @@ #ifndef DAYPERIODRULES_H #define DAYPERIODRULES_H -#include "unicode/locid.h" -#include "unicode/unistr.h" -#include "unicode/uobject.h" -#include "unicode/utypes.h" +#include <_foundation_unicode/locid.h> +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/uobject.h> +#include <_foundation_unicode/utypes.h> #include "resource.h" #include "uhash.h" diff --git a/icuSources/i18n/dcfmtsym.cpp b/icuSources/i18n/dcfmtsym.cpp index a5616e7..9728ea7 100644 --- a/icuSources/i18n/dcfmtsym.cpp +++ b/icuSources/i18n/dcfmtsym.cpp @@ -19,19 +19,19 @@ ******************************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/dcfmtsym.h" -#include "unicode/ures.h" -#include "unicode/decimfmt.h" -#include "unicode/ucurr.h" -#include "unicode/choicfmt.h" -#include "unicode/unistr.h" -#include "unicode/numsys.h" -#include "unicode/unum.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/dcfmtsym.h> +#include <_foundation_unicode/ures.h> +#include <_foundation_unicode/decimfmt.h> +#include <_foundation_unicode/ucurr.h> +#include <_foundation_unicode/choicfmt.h> +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/numsys.h> +#include <_foundation_unicode/unum.h> +#include <_foundation_unicode/utf16.h> #include "ucurrimp.h" #include "cstring.h" #include "locbased.h" @@ -62,7 +62,7 @@ static const char gNumberElementsLatnSymbols[] = "NumberElements/latn/symbols"; static const UChar INTL_CURRENCY_SYMBOL_STR[] = {0xa4, 0xa4, 0}; // List of field names to be loaded from the data files. -// These are parallel with the enum ENumberFormatSymbol in unicode/dcfmtsym.h. +// These are parallel with the enum ENumberFormatSymbol in _foundation_unicode/dcfmtsym.h. static const char *gNumberElementKeys[DecimalFormatSymbols::kFormatSymbolCount] = { "decimal", "group", diff --git a/icuSources/i18n/decContext.h b/icuSources/i18n/decContext.h index 91c6739..77601ef 100644 --- a/icuSources/i18n/decContext.h +++ b/icuSources/i18n/decContext.h @@ -29,7 +29,7 @@ * * Remove a few compiler warnings. */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #include "putilimp.h" /* */ diff --git a/icuSources/i18n/decimfmt.cpp b/icuSources/i18n/decimfmt.cpp index 85aaa97..ba90039 100644 --- a/icuSources/i18n/decimfmt.cpp +++ b/icuSources/i18n/decimfmt.cpp @@ -1,7 +1,7 @@ // © 2018 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING @@ -12,12 +12,12 @@ #include #include #include -#include "unicode/errorcode.h" -#include "unicode/decimfmt.h" +#include <_foundation_unicode/errorcode.h> +#include <_foundation_unicode/decimfmt.h> #if APPLE_ICU_CHANGES // rdar:/ -#include "unicode/ucurr.h" -#include "unicode/ustring.h" +#include <_foundation_unicode/ucurr.h> +#include <_foundation_unicode/ustring.h> #endif // APPLE_ICU_CHANGES #include "number_decimalquantity.h" #include "number_types.h" diff --git a/icuSources/i18n/displayoptions.cpp b/icuSources/i18n/displayoptions.cpp index bb49e60..80e45d1 100644 --- a/icuSources/i18n/displayoptions.cpp +++ b/icuSources/i18n/displayoptions.cpp @@ -1,12 +1,12 @@ // © 2022 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/displayoptions.h" -#include "unicode/udisplayoptions.h" +#include <_foundation_unicode/displayoptions.h> +#include <_foundation_unicode/udisplayoptions.h> #include "cstring.h" U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/double-conversion-bignum-dtoa.cpp b/icuSources/i18n/double-conversion-bignum-dtoa.cpp index 638e9cb..1fb047f 100644 --- a/icuSources/i18n/double-conversion-bignum-dtoa.cpp +++ b/icuSources/i18n/double-conversion-bignum-dtoa.cpp @@ -31,7 +31,7 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // ICU PATCH: ifdef around UCONFIG_NO_FORMATTING -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #include diff --git a/icuSources/i18n/double-conversion-bignum-dtoa.h b/icuSources/i18n/double-conversion-bignum-dtoa.h index edc21b0..a717622 100644 --- a/icuSources/i18n/double-conversion-bignum-dtoa.h +++ b/icuSources/i18n/double-conversion-bignum-dtoa.h @@ -31,7 +31,7 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // ICU PATCH: ifdef around UCONFIG_NO_FORMATTING -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #ifndef DOUBLE_CONVERSION_BIGNUM_DTOA_H_ diff --git a/icuSources/i18n/double-conversion-bignum.cpp b/icuSources/i18n/double-conversion-bignum.cpp index d2b701a..5caafae 100644 --- a/icuSources/i18n/double-conversion-bignum.cpp +++ b/icuSources/i18n/double-conversion-bignum.cpp @@ -31,7 +31,7 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // ICU PATCH: ifdef around UCONFIG_NO_FORMATTING -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #include diff --git a/icuSources/i18n/double-conversion-bignum.h b/icuSources/i18n/double-conversion-bignum.h index bae900a..12513d9 100644 --- a/icuSources/i18n/double-conversion-bignum.h +++ b/icuSources/i18n/double-conversion-bignum.h @@ -31,7 +31,7 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // ICU PATCH: ifdef around UCONFIG_NO_FORMATTING -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #ifndef DOUBLE_CONVERSION_BIGNUM_H_ diff --git a/icuSources/i18n/double-conversion-cached-powers.cpp b/icuSources/i18n/double-conversion-cached-powers.cpp index 3bc35c8..4f2469d 100644 --- a/icuSources/i18n/double-conversion-cached-powers.cpp +++ b/icuSources/i18n/double-conversion-cached-powers.cpp @@ -31,7 +31,7 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // ICU PATCH: ifdef around UCONFIG_NO_FORMATTING -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #include diff --git a/icuSources/i18n/double-conversion-cached-powers.h b/icuSources/i18n/double-conversion-cached-powers.h index ade27ba..76b7a98 100644 --- a/icuSources/i18n/double-conversion-cached-powers.h +++ b/icuSources/i18n/double-conversion-cached-powers.h @@ -31,7 +31,7 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // ICU PATCH: ifdef around UCONFIG_NO_FORMATTING -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #ifndef DOUBLE_CONVERSION_CACHED_POWERS_H_ diff --git a/icuSources/i18n/double-conversion-diy-fp.h b/icuSources/i18n/double-conversion-diy-fp.h index 5820abe..61fa7a3 100644 --- a/icuSources/i18n/double-conversion-diy-fp.h +++ b/icuSources/i18n/double-conversion-diy-fp.h @@ -31,7 +31,7 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // ICU PATCH: ifdef around UCONFIG_NO_FORMATTING -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #ifndef DOUBLE_CONVERSION_DIY_FP_H_ diff --git a/icuSources/i18n/double-conversion-double-to-string.cpp b/icuSources/i18n/double-conversion-double-to-string.cpp index 5ee6d2b..f246f4c 100644 --- a/icuSources/i18n/double-conversion-double-to-string.cpp +++ b/icuSources/i18n/double-conversion-double-to-string.cpp @@ -31,7 +31,7 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // ICU PATCH: ifdef around UCONFIG_NO_FORMATTING -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #include diff --git a/icuSources/i18n/double-conversion-double-to-string.h b/icuSources/i18n/double-conversion-double-to-string.h index 1fae2e8..c218a1a 100644 --- a/icuSources/i18n/double-conversion-double-to-string.h +++ b/icuSources/i18n/double-conversion-double-to-string.h @@ -31,7 +31,7 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // ICU PATCH: ifdef around UCONFIG_NO_FORMATTING -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #ifndef DOUBLE_CONVERSION_DOUBLE_TO_STRING_H_ diff --git a/icuSources/i18n/double-conversion-fast-dtoa.cpp b/icuSources/i18n/double-conversion-fast-dtoa.cpp index 06e4cf1..24e9fc6 100644 --- a/icuSources/i18n/double-conversion-fast-dtoa.cpp +++ b/icuSources/i18n/double-conversion-fast-dtoa.cpp @@ -31,7 +31,7 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // ICU PATCH: ifdef around UCONFIG_NO_FORMATTING -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING // ICU PATCH: Customize header file paths for ICU. diff --git a/icuSources/i18n/double-conversion-fast-dtoa.h b/icuSources/i18n/double-conversion-fast-dtoa.h index 58a6470..a4a1c9c 100644 --- a/icuSources/i18n/double-conversion-fast-dtoa.h +++ b/icuSources/i18n/double-conversion-fast-dtoa.h @@ -31,7 +31,7 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // ICU PATCH: ifdef around UCONFIG_NO_FORMATTING -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #ifndef DOUBLE_CONVERSION_FAST_DTOA_H_ diff --git a/icuSources/i18n/double-conversion-ieee.h b/icuSources/i18n/double-conversion-ieee.h index 2940acb..6366f0d 100644 --- a/icuSources/i18n/double-conversion-ieee.h +++ b/icuSources/i18n/double-conversion-ieee.h @@ -31,7 +31,7 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // ICU PATCH: ifdef around UCONFIG_NO_FORMATTING -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #ifndef DOUBLE_CONVERSION_DOUBLE_H_ diff --git a/icuSources/i18n/double-conversion-string-to-double.cpp b/icuSources/i18n/double-conversion-string-to-double.cpp index 727fff2..68eb2f5 100644 --- a/icuSources/i18n/double-conversion-string-to-double.cpp +++ b/icuSources/i18n/double-conversion-string-to-double.cpp @@ -31,7 +31,7 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // ICU PATCH: ifdef around UCONFIG_NO_FORMATTING -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING // ICU PATCH: Do not include std::locale. diff --git a/icuSources/i18n/double-conversion-string-to-double.h b/icuSources/i18n/double-conversion-string-to-double.h index 9f6f530..d4ed1a9 100644 --- a/icuSources/i18n/double-conversion-string-to-double.h +++ b/icuSources/i18n/double-conversion-string-to-double.h @@ -31,7 +31,7 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // ICU PATCH: ifdef around UCONFIG_NO_FORMATTING -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #ifndef DOUBLE_CONVERSION_STRING_TO_DOUBLE_H_ diff --git a/icuSources/i18n/double-conversion-strtod.cpp b/icuSources/i18n/double-conversion-strtod.cpp index eea8203..b2a5a4e 100644 --- a/icuSources/i18n/double-conversion-strtod.cpp +++ b/icuSources/i18n/double-conversion-strtod.cpp @@ -31,7 +31,7 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // ICU PATCH: ifdef around UCONFIG_NO_FORMATTING -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #include diff --git a/icuSources/i18n/double-conversion-strtod.h b/icuSources/i18n/double-conversion-strtod.h index abfe00a..6cc6f54 100644 --- a/icuSources/i18n/double-conversion-strtod.h +++ b/icuSources/i18n/double-conversion-strtod.h @@ -31,7 +31,7 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // ICU PATCH: ifdef around UCONFIG_NO_FORMATTING -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #ifndef DOUBLE_CONVERSION_STRTOD_H_ diff --git a/icuSources/i18n/double-conversion-utils.h b/icuSources/i18n/double-conversion-utils.h index 303668f..061b026 100644 --- a/icuSources/i18n/double-conversion-utils.h +++ b/icuSources/i18n/double-conversion-utils.h @@ -31,7 +31,7 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // ICU PATCH: ifdef around UCONFIG_NO_FORMATTING -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #ifndef DOUBLE_CONVERSION_UTILS_H_ diff --git a/icuSources/i18n/double-conversion.h b/icuSources/i18n/double-conversion.h index eddc387..a4e6ce4 100644 --- a/icuSources/i18n/double-conversion.h +++ b/icuSources/i18n/double-conversion.h @@ -31,7 +31,7 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // ICU PATCH: ifdef around UCONFIG_NO_FORMATTING -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #ifndef DOUBLE_CONVERSION_DOUBLE_CONVERSION_H_ diff --git a/icuSources/i18n/dt_impl.h b/icuSources/i18n/dt_impl.h index a4058c6..e927aa4 100644 --- a/icuSources/i18n/dt_impl.h +++ b/icuSources/i18n/dt_impl.h @@ -22,7 +22,7 @@ #if !UCONFIG_NO_FORMATTING -#include "unicode/unistr.h" +#include <_foundation_unicode/unistr.h> #define QUOTE ((UChar)0x0027) diff --git a/icuSources/i18n/dtfmtsym.cpp b/icuSources/i18n/dtfmtsym.cpp index 4c44976..d30da62 100644 --- a/icuSources/i18n/dtfmtsym.cpp +++ b/icuSources/i18n/dtfmtsym.cpp @@ -24,16 +24,16 @@ #include -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/ustring.h" -#include "unicode/localpointer.h" -#include "unicode/dtfmtsym.h" -#include "unicode/smpdtfmt.h" -#include "unicode/msgfmt.h" -#include "unicode/numsys.h" -#include "unicode/tznames.h" +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/localpointer.h> +#include <_foundation_unicode/dtfmtsym.h> +#include <_foundation_unicode/smpdtfmt.h> +#include <_foundation_unicode/msgfmt.h> +#include <_foundation_unicode/numsys.h> +#include <_foundation_unicode/tznames.h> #include "cpputils.h" #include "umutex.h" #include "cmemory.h" @@ -48,7 +48,7 @@ #include "ureslocs.h" #include "uvector.h" #include "shareddateformatsymbols.h" -#include "unicode/calendar.h" +#include <_foundation_unicode/calendar.h> #include "unifiedcache.h" // ***************************************************************************** diff --git a/icuSources/i18n/dtitv_impl.h b/icuSources/i18n/dtitv_impl.h index 6fc16bb..8b95069 100644 --- a/icuSources/i18n/dtitv_impl.h +++ b/icuSources/i18n/dtitv_impl.h @@ -22,7 +22,7 @@ #if !UCONFIG_NO_FORMATTING -#include "unicode/unistr.h" +#include <_foundation_unicode/unistr.h> #define QUOTE ((UChar)0x0027) diff --git a/icuSources/i18n/dtitvfmt.cpp b/icuSources/i18n/dtitvfmt.cpp index fdb2a4f..65e7ad7 100644 --- a/icuSources/i18n/dtitvfmt.cpp +++ b/icuSources/i18n/dtitvfmt.cpp @@ -12,18 +12,18 @@ #include "utypeinfo.h" // for 'typeid' to work -#include "unicode/dtitvfmt.h" +#include <_foundation_unicode/dtitvfmt.h> #if !UCONFIG_NO_FORMATTING //TODO: put in compilation //#define DTITVFMT_DEBUG 1 -#include "unicode/calendar.h" -#include "unicode/dtptngen.h" -#include "unicode/dtitvinf.h" -#include "unicode/simpleformatter.h" -#include "unicode/udisplaycontext.h" +#include <_foundation_unicode/calendar.h> +#include <_foundation_unicode/dtptngen.h> +#include <_foundation_unicode/dtitvinf.h> +#include <_foundation_unicode/simpleformatter.h> +#include <_foundation_unicode/udisplaycontext.h> #include "cmemory.h" #include "cstring.h" #include "dtitv_impl.h" @@ -33,7 +33,7 @@ #if APPLE_ICU_CHANGES // rdar:/ // Apple addition -#include "unicode/udateintervalformat.h" +#include <_foundation_unicode/udateintervalformat.h> #endif // APPLE_ICU_CHANGES #ifdef DTITVFMT_DEBUG diff --git a/icuSources/i18n/dtitvinf.cpp b/icuSources/i18n/dtitvinf.cpp index 2b0f792..0a26fd2 100644 --- a/icuSources/i18n/dtitvinf.cpp +++ b/icuSources/i18n/dtitvinf.cpp @@ -10,7 +10,7 @@ ******************************************************************************* */ -#include "unicode/dtitvinf.h" +#include <_foundation_unicode/dtitvinf.h> #if !UCONFIG_NO_FORMATTING @@ -25,9 +25,9 @@ #include "cmemory.h" #include "cstring.h" -#include "unicode/msgfmt.h" -#include "unicode/uloc.h" -#include "unicode/ures.h" +#include <_foundation_unicode/msgfmt.h> +#include <_foundation_unicode/uloc.h> +#include <_foundation_unicode/ures.h> #include "dtitv_impl.h" #include "charstr.h" #include "hash.h" diff --git a/icuSources/i18n/dtptngen.cpp b/icuSources/i18n/dtptngen.cpp index c4ded92..ea725b6 100644 --- a/icuSources/i18n/dtptngen.cpp +++ b/icuSources/i18n/dtptngen.cpp @@ -11,28 +11,28 @@ ******************************************************************************* */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/datefmt.h" -#include "unicode/decimfmt.h" -#include "unicode/dtfmtsym.h" -#include "unicode/dtptngen.h" -#include "unicode/localpointer.h" +#include <_foundation_unicode/datefmt.h> +#include <_foundation_unicode/decimfmt.h> +#include <_foundation_unicode/dtfmtsym.h> +#include <_foundation_unicode/dtptngen.h> +#include <_foundation_unicode/localpointer.h> #if APPLE_ICU_CHANGES // rdar:/ -#include "unicode/schriter.h" +#include <_foundation_unicode/schriter.h> #endif // APPLE_ICU_CHANGES -#include "unicode/simpleformatter.h" -#include "unicode/smpdtfmt.h" -#include "unicode/udat.h" -#include "unicode/udatpg.h" -#include "unicode/uniset.h" -#include "unicode/uloc.h" -#include "unicode/ures.h" -#include "unicode/ustring.h" -#include "unicode/rep.h" -#include "unicode/region.h" +#include <_foundation_unicode/simpleformatter.h> +#include <_foundation_unicode/smpdtfmt.h> +#include <_foundation_unicode/udat.h> +#include <_foundation_unicode/udatpg.h> +#include <_foundation_unicode/uniset.h> +#include <_foundation_unicode/uloc.h> +#include <_foundation_unicode/ures.h> +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/rep.h> +#include <_foundation_unicode/region.h> #include "cpputils.h" #include "mutex.h" #include "umutex.h" @@ -58,7 +58,7 @@ #if defined(U_USE_ASCII_BUNDLE_ITERATOR) -#include "unicode/ustring.h" +#include <_foundation_unicode/ustring.h> #include "uarrsort.h" struct UResAEntry { diff --git a/icuSources/i18n/dtptngen_impl.h b/icuSources/i18n/dtptngen_impl.h index 9a91f65..6591db0 100644 --- a/icuSources/i18n/dtptngen_impl.h +++ b/icuSources/i18n/dtptngen_impl.h @@ -14,10 +14,10 @@ #ifndef __DTPTNGEN_IMPL_H__ #define __DTPTNGEN_IMPL_H__ -#include "unicode/udatpg.h" +#include <_foundation_unicode/udatpg.h> -#include "unicode/strenum.h" -#include "unicode/unistr.h" +#include <_foundation_unicode/strenum.h> +#include <_foundation_unicode/unistr.h> #include "uvector.h" // TODO(claireho): Split off Builder class. diff --git a/icuSources/i18n/dtrule.cpp b/icuSources/i18n/dtrule.cpp index 63949b6..dc8d612 100644 --- a/icuSources/i18n/dtrule.cpp +++ b/icuSources/i18n/dtrule.cpp @@ -9,11 +9,11 @@ #include "utypeinfo.h" // for 'typeid' to work -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/dtrule.h" +#include <_foundation_unicode/dtrule.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/erarules.cpp b/icuSources/i18n/erarules.cpp index 7c276f2..e504111 100644 --- a/icuSources/i18n/erarules.cpp +++ b/icuSources/i18n/erarules.cpp @@ -3,15 +3,15 @@ #include -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #include -#include "unicode/ucal.h" -#include "unicode/ures.h" -#include "unicode/ustring.h" -#include "unicode/timezone.h" +#include <_foundation_unicode/ucal.h> +#include <_foundation_unicode/ures.h> +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/timezone.h> #include "cmemory.h" #include "cstring.h" #include "erarules.h" diff --git a/icuSources/i18n/erarules.h b/icuSources/i18n/erarules.h index 74b7862..135d0f2 100644 --- a/icuSources/i18n/erarules.h +++ b/icuSources/i18n/erarules.h @@ -4,12 +4,12 @@ #ifndef ERARULES_H_ #define ERARULES_H_ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/localpointer.h" -#include "unicode/uobject.h" +#include <_foundation_unicode/localpointer.h> +#include <_foundation_unicode/uobject.h> #include "cmemory.h" U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/esctrn.cpp b/icuSources/i18n/esctrn.cpp index 00c1304..bf338d1 100644 --- a/icuSources/i18n/esctrn.cpp +++ b/icuSources/i18n/esctrn.cpp @@ -10,11 +10,11 @@ ********************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_TRANSLITERATION -#include "unicode/utf16.h" +#include <_foundation_unicode/utf16.h> #include "esctrn.h" #include "util.h" diff --git a/icuSources/i18n/esctrn.h b/icuSources/i18n/esctrn.h index a4282ea..16ae984 100644 --- a/icuSources/i18n/esctrn.h +++ b/icuSources/i18n/esctrn.h @@ -12,11 +12,11 @@ #ifndef ESCTRN_H #define ESCTRN_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_TRANSLITERATION -#include "unicode/translit.h" +#include <_foundation_unicode/translit.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/ethpccal.cpp b/icuSources/i18n/ethpccal.cpp index 0793787..fc92dc9 100644 --- a/icuSources/i18n/ethpccal.cpp +++ b/icuSources/i18n/ethpccal.cpp @@ -7,7 +7,7 @@ ******************************************************************************* */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING diff --git a/icuSources/i18n/ethpccal.h b/icuSources/i18n/ethpccal.h index 0cc5b6c..85d99d8 100644 --- a/icuSources/i18n/ethpccal.h +++ b/icuSources/i18n/ethpccal.h @@ -10,11 +10,11 @@ #ifndef ETHPCCAL_H #define ETHPCCAL_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/calendar.h" +#include <_foundation_unicode/calendar.h> #include "cecal.h" U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/fmtable.cpp b/icuSources/i18n/fmtable.cpp index c3ede98..fbd2c30 100644 --- a/icuSources/i18n/fmtable.cpp +++ b/icuSources/i18n/fmtable.cpp @@ -15,17 +15,17 @@ ******************************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #include #include -#include "unicode/fmtable.h" -#include "unicode/ustring.h" -#include "unicode/measure.h" -#include "unicode/curramt.h" -#include "unicode/uformattable.h" +#include <_foundation_unicode/fmtable.h> +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/measure.h> +#include <_foundation_unicode/curramt.h> +#include <_foundation_unicode/uformattable.h> #include "charstr.h" #include "cmemory.h" #include "cstring.h" @@ -824,7 +824,7 @@ Formattable::setDecimalNumber(StringPiece numberString, UErrorCode &status) { #include using namespace std; -#include "unicode/datefmt.h" +#include <_foundation_unicode/datefmt.h> #include "unistrm.h" class FormattableStreamer /* not : public UObject because all methods are static */ { diff --git a/icuSources/i18n/fmtable_cnv.cpp b/icuSources/i18n/fmtable_cnv.cpp index bc3847b..1c52850 100644 --- a/icuSources/i18n/fmtable_cnv.cpp +++ b/icuSources/i18n/fmtable_cnv.cpp @@ -15,11 +15,11 @@ ******************************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING && !UCONFIG_NO_CONVERSION -#include "unicode/fmtable.h" +#include <_foundation_unicode/fmtable.h> // ***************************************************************************** // class Formattable diff --git a/icuSources/i18n/format.cpp b/icuSources/i18n/format.cpp index 10856a4..a2bd495 100644 --- a/icuSources/i18n/format.cpp +++ b/icuSources/i18n/format.cpp @@ -23,7 +23,7 @@ #include "utypeinfo.h" // for 'typeid' to work -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #ifndef U_I18N_IMPLEMENTATION #error U_I18N_IMPLEMENTATION not set - must be set for all ICU source files in i18n/ - see https://unicode-org.github.io/icu/userguide/howtouseicu @@ -46,8 +46,8 @@ uprv_icuin_lib_dummy(int32_t i) { #if !UCONFIG_NO_FORMATTING -#include "unicode/format.h" -#include "unicode/ures.h" +#include <_foundation_unicode/format.h> +#include <_foundation_unicode/ures.h> #include "cstring.h" #include "locbased.h" diff --git a/icuSources/i18n/formatted_string_builder.cpp b/icuSources/i18n/formatted_string_builder.cpp index 3418d6c..208038c 100644 --- a/icuSources/i18n/formatted_string_builder.cpp +++ b/icuSources/i18n/formatted_string_builder.cpp @@ -1,15 +1,15 @@ // © 2017 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #include "formatted_string_builder.h" #include "putilimp.h" -#include "unicode/ustring.h" -#include "unicode/utf16.h" -#include "unicode/unum.h" // for UNumberFormatFields literals +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/utf16.h> +#include <_foundation_unicode/unum.h> // for UNumberFormatFields literals namespace { diff --git a/icuSources/i18n/formatted_string_builder.h b/icuSources/i18n/formatted_string_builder.h index 74ebc16..a7ad74f 100644 --- a/icuSources/i18n/formatted_string_builder.h +++ b/icuSources/i18n/formatted_string_builder.h @@ -1,7 +1,7 @@ // © 2017 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #ifndef __NUMBER_STRINGBUILDER_H__ diff --git a/icuSources/i18n/formattedval_impl.h b/icuSources/i18n/formattedval_impl.h index 2b9a397..a668c09 100644 --- a/icuSources/i18n/formattedval_impl.h +++ b/icuSources/i18n/formattedval_impl.h @@ -4,7 +4,7 @@ #ifndef __FORMVAL_IMPL_H__ #define __FORMVAL_IMPL_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING // This file contains compliant implementations of FormattedValue which can be @@ -13,7 +13,7 @@ // Each implementation is defined in its own cpp file in order to split // dependencies more modularly. -#include "unicode/formattedvalue.h" +#include <_foundation_unicode/formattedvalue.h> #include "capi_helper.h" #include "fphdlimp.h" #include "util.h" diff --git a/icuSources/i18n/formattedval_iterimpl.cpp b/icuSources/i18n/formattedval_iterimpl.cpp index ec770e2..7f9afb9 100644 --- a/icuSources/i18n/formattedval_iterimpl.cpp +++ b/icuSources/i18n/formattedval_iterimpl.cpp @@ -1,7 +1,7 @@ // © 2018 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING diff --git a/icuSources/i18n/formattedval_sbimpl.cpp b/icuSources/i18n/formattedval_sbimpl.cpp index 72197cd..6e35367 100644 --- a/icuSources/i18n/formattedval_sbimpl.cpp +++ b/icuSources/i18n/formattedval_sbimpl.cpp @@ -1,7 +1,7 @@ // © 2018 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING @@ -9,13 +9,13 @@ // Other independent implementations should go into their own cpp file for // better dependency modularization. -#include "unicode/ustring.h" +#include <_foundation_unicode/ustring.h> #include "formattedval_impl.h" #include "number_types.h" #include "formatted_string_builder.h" #include "number_utils.h" #include "static_unicode_sets.h" -#include "unicode/listformatter.h" +#include <_foundation_unicode/listformatter.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/formattedvalue.cpp b/icuSources/i18n/formattedvalue.cpp index f103c01..61b24c6 100644 --- a/icuSources/i18n/formattedvalue.cpp +++ b/icuSources/i18n/formattedvalue.cpp @@ -1,11 +1,11 @@ // © 2018 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/formattedvalue.h" +#include <_foundation_unicode/formattedvalue.h> #include "formattedval_impl.h" #include "capi_helper.h" diff --git a/icuSources/i18n/fphdlimp.cpp b/icuSources/i18n/fphdlimp.cpp index 4f6a98c..26eb662 100644 --- a/icuSources/i18n/fphdlimp.cpp +++ b/icuSources/i18n/fphdlimp.cpp @@ -7,7 +7,7 @@ ******************************************************************************* */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING diff --git a/icuSources/i18n/fphdlimp.h b/icuSources/i18n/fphdlimp.h index 4fb0c7b..9830caa 100644 --- a/icuSources/i18n/fphdlimp.h +++ b/icuSources/i18n/fphdlimp.h @@ -10,13 +10,13 @@ #ifndef FPHDLIMP_H #define FPHDLIMP_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/fieldpos.h" -#include "unicode/fpositer.h" -#include "unicode/formattedvalue.h" +#include <_foundation_unicode/fieldpos.h> +#include <_foundation_unicode/fpositer.h> +#include <_foundation_unicode/formattedvalue.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/fpositer.cpp b/icuSources/i18n/fpositer.cpp index 64bec99..feb43f0 100644 --- a/icuSources/i18n/fpositer.cpp +++ b/icuSources/i18n/fpositer.cpp @@ -10,11 +10,11 @@ ****************************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/fpositer.h" +#include <_foundation_unicode/fpositer.h> #include "cmemory.h" #include "uvectr32.h" diff --git a/icuSources/i18n/funcrepl.cpp b/icuSources/i18n/funcrepl.cpp index 7dd54ed..df7c336 100644 --- a/icuSources/i18n/funcrepl.cpp +++ b/icuSources/i18n/funcrepl.cpp @@ -10,12 +10,12 @@ ********************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_TRANSLITERATION -#include "unicode/translit.h" -#include "unicode/uniset.h" +#include <_foundation_unicode/translit.h> +#include <_foundation_unicode/uniset.h> #include "funcrepl.h" static const UChar AMPERSAND = 38; // '&' diff --git a/icuSources/i18n/funcrepl.h b/icuSources/i18n/funcrepl.h index 529a10e..421e162 100644 --- a/icuSources/i18n/funcrepl.h +++ b/icuSources/i18n/funcrepl.h @@ -13,12 +13,12 @@ #ifndef FUNCREPL_H #define FUNCREPL_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_TRANSLITERATION -#include "unicode/unifunct.h" -#include "unicode/unirepl.h" +#include <_foundation_unicode/unifunct.h> +#include <_foundation_unicode/unirepl.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/gender.cpp b/icuSources/i18n/gender.cpp index ef64d17..6e6b570 100644 --- a/icuSources/i18n/gender.cpp +++ b/icuSources/i18n/gender.cpp @@ -15,13 +15,13 @@ ******************************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/gender.h" -#include "unicode/ugender.h" -#include "unicode/ures.h" +#include <_foundation_unicode/gender.h> +#include <_foundation_unicode/ugender.h> +#include <_foundation_unicode/ures.h> #include "cmemory.h" #include "cstring.h" diff --git a/icuSources/i18n/gregocal.cpp b/icuSources/i18n/gregocal.cpp index 94292e0..454788c 100644 --- a/icuSources/i18n/gregocal.cpp +++ b/icuSources/i18n/gregocal.cpp @@ -39,12 +39,12 @@ ******************************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #include #if !UCONFIG_NO_FORMATTING -#include "unicode/gregocal.h" +#include <_foundation_unicode/gregocal.h> #include "gregoimp.h" #include "umutex.h" #include "uassert.h" diff --git a/icuSources/i18n/gregoimp.cpp b/icuSources/i18n/gregoimp.cpp index f862cd1..3c33787 100644 --- a/icuSources/i18n/gregoimp.cpp +++ b/icuSources/i18n/gregoimp.cpp @@ -15,7 +15,7 @@ #if !UCONFIG_NO_FORMATTING -#include "unicode/ucal.h" +#include <_foundation_unicode/ucal.h> #include "uresimp.h" #include "cstring.h" #include "uassert.h" diff --git a/icuSources/i18n/gregoimp.h b/icuSources/i18n/gregoimp.h index d65d6a4..f0d36ce 100644 --- a/icuSources/i18n/gregoimp.h +++ b/icuSources/i18n/gregoimp.h @@ -13,11 +13,11 @@ #ifndef GREGOIMP_H #define GREGOIMP_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/ures.h" -#include "unicode/locid.h" +#include <_foundation_unicode/ures.h> +#include <_foundation_unicode/locid.h> #include "putilimp.h" U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/hebrwcal.h b/icuSources/i18n/hebrwcal.h index d75651d..1fefbcd 100644 --- a/icuSources/i18n/hebrwcal.h +++ b/icuSources/i18n/hebrwcal.h @@ -19,12 +19,12 @@ #ifndef HEBRWCAL_H #define HEBRWCAL_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/calendar.h" -#include "unicode/gregocal.h" +#include <_foundation_unicode/calendar.h> +#include <_foundation_unicode/gregocal.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/icuin40shim.cpp b/icuSources/i18n/icuin40shim.cpp index 2a90a74..a90e7d7 100644 --- a/icuSources/i18n/icuin40shim.cpp +++ b/icuSources/i18n/icuin40shim.cpp @@ -4,14 +4,14 @@ ***************************************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> -#include -#include +#include <_foundation_unicode/ucol.h> +#include <_foundation_unicode/utrans.h> /* * imp: i18n/ucol_res.cpp - * hdr: i18n/unicode/ucol.h + * hdr: i18n/_foundation_unicode/ucol.h * @stable ICU 2.0 */ U_CAPI UCollator* U_EXPORT2 @@ -22,7 +22,7 @@ ucol_open_4_0(const char *loc, UErrorCode *status) /* * imp: i18n/ucol.cpp - * hdr: i18n/unicode/ucol.h + * hdr: i18n/_foundation_unicode/ucol.h * @stable ICU 2.0 */ U_CAPI void U_EXPORT2 @@ -33,7 +33,7 @@ ucol_close_4_0(UCollator *coll) /* * imp: i18n/ucol.cpp - * hdr: i18n/unicode/ucol.h + * hdr: i18n/_foundation_unicode/ucol.h * @stable ICU 2.1 */ U_CAPI int32_t U_EXPORT2 @@ -50,7 +50,7 @@ ucol_getBound_4_0(const uint8_t *source, /* * imp: i18n/ucol.cpp - * hdr: i18n/unicode/ucol.h + * hdr: i18n/_foundation_unicode/ucol.h * @stable ICU 2.0 */ U_CAPI int32_t U_EXPORT2 @@ -65,7 +65,7 @@ ucol_getSortKey_4_0(const UCollator *coll, /* * imp: i18n/ucol.cpp - * hdr: i18n/unicode/ucol.h + * hdr: i18n/_foundation_unicode/ucol.h * @stable ICU 2.0 */ U_CAPI void U_EXPORT2 @@ -76,7 +76,7 @@ ucol_setAttribute_4_0(UCollator *coll, UColAttribute attr, UColAttributeValue va /* * imp: i18n/utrans.cpp - * hdr: i18n/unicode/utrans.h + * hdr: i18n/_foundation_unicode/utrans.h * @stable ICU 2.8 */ U_CAPI UTransliterator* U_EXPORT2 @@ -93,7 +93,7 @@ utrans_openU_4_0(const UChar *id, /* * imp: i18n/utrans.cpp - * hdr: i18n/unicode/utrans.h + * hdr: i18n/_foundation_unicode/utrans.h * @stable ICU 2.0 */ U_CAPI void U_EXPORT2 @@ -104,7 +104,7 @@ utrans_close_4_0(UTransliterator* trans) /* * imp: i18n/utrans.cpp - * hdr: i18n/unicode/utrans.h + * hdr: i18n/_foundation_unicode/utrans.h * @stable ICU 2.0 */ U_CAPI void U_EXPORT2 diff --git a/icuSources/i18n/indiancal.h b/icuSources/i18n/indiancal.h index bfbea00..0107077 100644 --- a/icuSources/i18n/indiancal.h +++ b/icuSources/i18n/indiancal.h @@ -13,11 +13,11 @@ #ifndef INDIANCAL_H #define INDIANCAL_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/calendar.h" +#include <_foundation_unicode/calendar.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/inputext.cpp b/icuSources/i18n/inputext.cpp index f7638bc..b78c66c 100644 --- a/icuSources/i18n/inputext.cpp +++ b/icuSources/i18n/inputext.cpp @@ -7,7 +7,7 @@ ********************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_CONVERSION diff --git a/icuSources/i18n/inputext.h b/icuSources/i18n/inputext.h index 9641fcb..353b244 100644 --- a/icuSources/i18n/inputext.h +++ b/icuSources/i18n/inputext.h @@ -19,7 +19,7 @@ */ -#include "unicode/uobject.h" +#include <_foundation_unicode/uobject.h> #if !UCONFIG_NO_CONVERSION diff --git a/icuSources/i18n/islamcal.h b/icuSources/i18n/islamcal.h index 7d9941d..fccb7d7 100644 --- a/icuSources/i18n/islamcal.h +++ b/icuSources/i18n/islamcal.h @@ -18,11 +18,11 @@ #ifndef ISLAMCAL_H #define ISLAMCAL_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/calendar.h" +#include <_foundation_unicode/calendar.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/japancal.cpp b/icuSources/i18n/japancal.cpp index ca9b070..4547b59 100644 --- a/icuSources/i18n/japancal.cpp +++ b/icuSources/i18n/japancal.cpp @@ -13,7 +13,7 @@ * */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #if U_PLATFORM_HAS_WINUWP_API == 0 @@ -32,7 +32,7 @@ #include "cmemory.h" #include "erarules.h" #include "japancal.h" -#include "unicode/gregocal.h" +#include <_foundation_unicode/gregocal.h> #include "umutex.h" #include "uassert.h" #include "ucln_in.h" diff --git a/icuSources/i18n/japancal.h b/icuSources/i18n/japancal.h index 8851344..7a96083 100644 --- a/icuSources/i18n/japancal.h +++ b/icuSources/i18n/japancal.h @@ -18,12 +18,12 @@ #ifndef JAPANCAL_H #define JAPANCAL_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/calendar.h" -#include "unicode/gregocal.h" +#include <_foundation_unicode/calendar.h> +#include <_foundation_unicode/gregocal.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/listformatter.cpp b/icuSources/i18n/listformatter.cpp index c0476a7..6289ec6 100644 --- a/icuSources/i18n/listformatter.cpp +++ b/icuSources/i18n/listformatter.cpp @@ -16,16 +16,16 @@ * created by: Umesh P. Nair */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #include "cmemory.h" -#include "unicode/fpositer.h" // FieldPositionIterator -#include "unicode/listformatter.h" -#include "unicode/simpleformatter.h" -#include "unicode/ulistformatter.h" -#include "unicode/uscript.h" +#include <_foundation_unicode/fpositer.h> // FieldPositionIterator +#include <_foundation_unicode/listformatter.h> +#include <_foundation_unicode/simpleformatter.h> +#include <_foundation_unicode/ulistformatter.h> +#include <_foundation_unicode/uscript.h> #include "fphdlimp.h" #include "mutex.h" #include "hash.h" diff --git a/icuSources/i18n/measfmt.cpp b/icuSources/i18n/measfmt.cpp index b5ca09a..1f3b72a 100644 --- a/icuSources/i18n/measfmt.cpp +++ b/icuSources/i18n/measfmt.cpp @@ -11,38 +11,38 @@ ********************************************************************** */ #include "utypeinfo.h" // for 'typeid' to work -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/measfmt.h" -#include "unicode/numfmt.h" +#include <_foundation_unicode/measfmt.h> +#include <_foundation_unicode/numfmt.h> #include "currfmt.h" -#include "unicode/localpointer.h" +#include <_foundation_unicode/localpointer.h> #include "resource.h" -#include "unicode/simpleformatter.h" +#include <_foundation_unicode/simpleformatter.h> #include "quantityformatter.h" -#include "unicode/plurrule.h" -#include "unicode/decimfmt.h" +#include <_foundation_unicode/plurrule.h> +#include <_foundation_unicode/decimfmt.h> #include "uresimp.h" -#include "unicode/ures.h" -#include "unicode/ustring.h" +#include <_foundation_unicode/ures.h> +#include <_foundation_unicode/ustring.h> #include "ureslocs.h" #include "cstring.h" #include "mutex.h" #include "ucln_in.h" -#include "unicode/listformatter.h" +#include <_foundation_unicode/listformatter.h> #include "charstr.h" -#include "unicode/putil.h" -#include "unicode/smpdtfmt.h" +#include <_foundation_unicode/putil.h> +#include <_foundation_unicode/smpdtfmt.h> #include "uassert.h" -#include "unicode/numberformatter.h" +#include <_foundation_unicode/numberformatter.h> #include "number_longnames.h" #include "number_utypes.h" #if APPLE_ICU_CHANGES // rdar:/ // Apple-specific -#include "unicode/uameasureformat.h" +#include <_foundation_unicode/uameasureformat.h> #include "fphdlimp.h" #endif // APPLE_ICU_CHANGES diff --git a/icuSources/i18n/measunit.cpp b/icuSources/i18n/measunit.cpp index 9df602a..f51df86 100644 --- a/icuSources/i18n/measunit.cpp +++ b/icuSources/i18n/measunit.cpp @@ -12,12 +12,12 @@ */ #include "utypeinfo.h" // for 'typeid' to work -#include "unicode/measunit.h" +#include <_foundation_unicode/measunit.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/uenum.h" -#include "unicode/errorcode.h" +#include <_foundation_unicode/uenum.h> +#include <_foundation_unicode/errorcode.h> #include "ustrenum.h" #include "cstring.h" #include "uassert.h" diff --git a/icuSources/i18n/measunit_extra.cpp b/icuSources/i18n/measunit_extra.cpp index 3d49d1d..c390b03 100644 --- a/icuSources/i18n/measunit_extra.cpp +++ b/icuSources/i18n/measunit_extra.cpp @@ -4,7 +4,7 @@ // Extra functions for MeasureUnit not needed for all clients. // Separate .o file so that it can be removed for modularity. -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING @@ -21,13 +21,13 @@ #include "uassert.h" #include "ucln_in.h" #include "umutex.h" -#include "unicode/bytestrie.h" -#include "unicode/bytestriebuilder.h" -#include "unicode/localpointer.h" -#include "unicode/stringpiece.h" -#include "unicode/stringtriebuilder.h" -#include "unicode/ures.h" -#include "unicode/ustringtrie.h" +#include <_foundation_unicode/bytestrie.h> +#include <_foundation_unicode/bytestriebuilder.h> +#include <_foundation_unicode/localpointer.h> +#include <_foundation_unicode/stringpiece.h> +#include <_foundation_unicode/stringtriebuilder.h> +#include <_foundation_unicode/ures.h> +#include <_foundation_unicode/ustringtrie.h> #include "uresimp.h" #include "util.h" #include diff --git a/icuSources/i18n/measunit_impl.h b/icuSources/i18n/measunit_impl.h index c60ff2f..8581aeb 100644 --- a/icuSources/i18n/measunit_impl.h +++ b/icuSources/i18n/measunit_impl.h @@ -4,11 +4,11 @@ #ifndef __MEASUNIT_IMPL_H__ #define __MEASUNIT_IMPL_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/measunit.h" +#include <_foundation_unicode/measunit.h> #include "cmemory.h" #include "charstr.h" diff --git a/icuSources/i18n/measure.cpp b/icuSources/i18n/measure.cpp index b9c47fd..31d2a35 100644 --- a/icuSources/i18n/measure.cpp +++ b/icuSources/i18n/measure.cpp @@ -12,12 +12,12 @@ */ #include "utypeinfo.h" // for 'typeid' to work -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/measure.h" -#include "unicode/measunit.h" +#include <_foundation_unicode/measure.h> +#include <_foundation_unicode/measunit.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/msgfmt.cpp b/icuSources/i18n/msgfmt.cpp index 29476f3..37a3782 100644 --- a/icuSources/i18n/msgfmt.cpp +++ b/icuSources/i18n/msgfmt.cpp @@ -21,23 +21,23 @@ * 11/01/09 kirtig Added SelectFormat ********************************************************************/ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/appendable.h" -#include "unicode/choicfmt.h" -#include "unicode/datefmt.h" -#include "unicode/decimfmt.h" -#include "unicode/localpointer.h" -#include "unicode/msgfmt.h" -#include "unicode/numberformatter.h" -#include "unicode/plurfmt.h" -#include "unicode/rbnf.h" -#include "unicode/selfmt.h" -#include "unicode/smpdtfmt.h" -#include "unicode/umsg.h" -#include "unicode/ustring.h" +#include <_foundation_unicode/appendable.h> +#include <_foundation_unicode/choicfmt.h> +#include <_foundation_unicode/datefmt.h> +#include <_foundation_unicode/decimfmt.h> +#include <_foundation_unicode/localpointer.h> +#include <_foundation_unicode/msgfmt.h> +#include <_foundation_unicode/numberformatter.h> +#include <_foundation_unicode/plurfmt.h> +#include <_foundation_unicode/rbnf.h> +#include <_foundation_unicode/selfmt.h> +#include <_foundation_unicode/smpdtfmt.h> +#include <_foundation_unicode/umsg.h> +#include <_foundation_unicode/ustring.h> #include "cmemory.h" #include "patternprops.h" #include "messageimpl.h" diff --git a/icuSources/i18n/msgfmt_impl.h b/icuSources/i18n/msgfmt_impl.h index 80cb8a6..8b0d41f 100644 --- a/icuSources/i18n/msgfmt_impl.h +++ b/icuSources/i18n/msgfmt_impl.h @@ -14,13 +14,13 @@ #ifndef __MSGFMT_IMPL_H__ #define __MSGFMT_IMPL_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/msgfmt.h" +#include <_foundation_unicode/msgfmt.h> #include "uvector.h" -#include "unicode/strenum.h" +#include <_foundation_unicode/strenum.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/name2uni.cpp b/icuSources/i18n/name2uni.cpp index b22c68b..dd94c61 100644 --- a/icuSources/i18n/name2uni.cpp +++ b/icuSources/i18n/name2uni.cpp @@ -10,14 +10,14 @@ ********************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_TRANSLITERATION -#include "unicode/unifilt.h" -#include "unicode/uchar.h" -#include "unicode/uniset.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/unifilt.h> +#include <_foundation_unicode/uchar.h> +#include <_foundation_unicode/uniset.h> +#include <_foundation_unicode/utf16.h> #include "cmemory.h" #include "name2uni.h" #include "patternprops.h" diff --git a/icuSources/i18n/name2uni.h b/icuSources/i18n/name2uni.h index 6881c6b..83db69b 100644 --- a/icuSources/i18n/name2uni.h +++ b/icuSources/i18n/name2uni.h @@ -12,12 +12,12 @@ #ifndef NAME2UNI_H #define NAME2UNI_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_TRANSLITERATION -#include "unicode/translit.h" -#include "unicode/uniset.h" +#include <_foundation_unicode/translit.h> +#include <_foundation_unicode/uniset.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/nfrlist.h b/icuSources/i18n/nfrlist.h index 3eb1882..f68a583 100644 --- a/icuSources/i18n/nfrlist.h +++ b/icuSources/i18n/nfrlist.h @@ -18,11 +18,11 @@ #ifndef NFRLIST_H #define NFRLIST_H -#include "unicode/rbnf.h" +#include <_foundation_unicode/rbnf.h> #if U_HAVE_RBNF -#include "unicode/uobject.h" +#include <_foundation_unicode/uobject.h> #include "nfrule.h" #include "cmemory.h" diff --git a/icuSources/i18n/nfrs.cpp b/icuSources/i18n/nfrs.cpp index db962b9..34144a5 100644 --- a/icuSources/i18n/nfrs.cpp +++ b/icuSources/i18n/nfrs.cpp @@ -19,7 +19,7 @@ #if U_HAVE_RBNF -#include "unicode/uchar.h" +#include <_foundation_unicode/uchar.h> #include "nfrule.h" #include "nfrlist.h" #include "patternprops.h" diff --git a/icuSources/i18n/nfrs.h b/icuSources/i18n/nfrs.h index 45ea7c2..211a5e0 100644 --- a/icuSources/i18n/nfrs.h +++ b/icuSources/i18n/nfrs.h @@ -18,13 +18,13 @@ #ifndef NFRS_H #define NFRS_H -#include "unicode/uobject.h" -#include "unicode/rbnf.h" +#include <_foundation_unicode/uobject.h> +#include <_foundation_unicode/rbnf.h> #if U_HAVE_RBNF -#include "unicode/utypes.h" -#include "unicode/umisc.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/umisc.h> #include "nfrlist.h" diff --git a/icuSources/i18n/nfrule.cpp b/icuSources/i18n/nfrule.cpp index 76ccc35..73bf2ef 100644 --- a/icuSources/i18n/nfrule.cpp +++ b/icuSources/i18n/nfrule.cpp @@ -19,13 +19,13 @@ #if U_HAVE_RBNF -#include "unicode/localpointer.h" -#include "unicode/rbnf.h" -#include "unicode/tblcoll.h" -#include "unicode/plurfmt.h" -#include "unicode/upluralrules.h" -#include "unicode/coleitr.h" -#include "unicode/uchar.h" +#include <_foundation_unicode/localpointer.h> +#include <_foundation_unicode/rbnf.h> +#include <_foundation_unicode/tblcoll.h> +#include <_foundation_unicode/plurfmt.h> +#include <_foundation_unicode/upluralrules.h> +#include <_foundation_unicode/coleitr.h> +#include <_foundation_unicode/uchar.h> #include "nfrs.h" #include "nfrlist.h" #include "nfsubs.h" diff --git a/icuSources/i18n/nfrule.h b/icuSources/i18n/nfrule.h index 627e998..7771fb4 100644 --- a/icuSources/i18n/nfrule.h +++ b/icuSources/i18n/nfrule.h @@ -10,13 +10,13 @@ #ifndef NFRULE_H #define NFRULE_H -#include "unicode/rbnf.h" +#include <_foundation_unicode/rbnf.h> #if U_HAVE_RBNF -#include "unicode/utypes.h" -#include "unicode/uobject.h" -#include "unicode/unistr.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/uobject.h> +#include <_foundation_unicode/unistr.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/nfsubs.h b/icuSources/i18n/nfsubs.h index f2539e9..d2d321b 100644 --- a/icuSources/i18n/nfsubs.h +++ b/icuSources/i18n/nfsubs.h @@ -18,14 +18,14 @@ #ifndef NFSUBS_H #define NFSUBS_H -#include "unicode/utypes.h" -#include "unicode/uobject.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/uobject.h> #include "nfrule.h" #if U_HAVE_RBNF -#include "unicode/utypes.h" -#include "unicode/decimfmt.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/decimfmt.h> #include "nfrs.h" #include diff --git a/icuSources/i18n/nortrans.cpp b/icuSources/i18n/nortrans.cpp index b1809da..e17c30e 100644 --- a/icuSources/i18n/nortrans.cpp +++ b/icuSources/i18n/nortrans.cpp @@ -10,12 +10,12 @@ ********************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_TRANSLITERATION -#include "unicode/normalizer2.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/normalizer2.h> +#include <_foundation_unicode/utf16.h> #include "cstring.h" #include "nortrans.h" diff --git a/icuSources/i18n/nortrans.h b/icuSources/i18n/nortrans.h index 01cb97a..dbccaa2 100644 --- a/icuSources/i18n/nortrans.h +++ b/icuSources/i18n/nortrans.h @@ -12,12 +12,12 @@ #ifndef NORTRANS_H #define NORTRANS_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_TRANSLITERATION -#include "unicode/translit.h" -#include "unicode/normalizer2.h" +#include <_foundation_unicode/translit.h> +#include <_foundation_unicode/normalizer2.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/nultrans.cpp b/icuSources/i18n/nultrans.cpp index 439cc55..b25e530 100644 --- a/icuSources/i18n/nultrans.cpp +++ b/icuSources/i18n/nultrans.cpp @@ -10,7 +10,7 @@ ********************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_TRANSLITERATION diff --git a/icuSources/i18n/nultrans.h b/icuSources/i18n/nultrans.h index f5f2fbc..a209d6f 100644 --- a/icuSources/i18n/nultrans.h +++ b/icuSources/i18n/nultrans.h @@ -12,11 +12,11 @@ #ifndef NULTRANS_H #define NULTRANS_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_TRANSLITERATION -#include "unicode/translit.h" +#include <_foundation_unicode/translit.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/number_affixutils.cpp b/icuSources/i18n/number_affixutils.cpp index 5f5ff4c..7942321 100644 --- a/icuSources/i18n/number_affixutils.cpp +++ b/icuSources/i18n/number_affixutils.cpp @@ -1,13 +1,13 @@ // © 2017 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #include "number_affixutils.h" -#include "unicode/utf16.h" -#include "unicode/uniset.h" +#include <_foundation_unicode/utf16.h> +#include <_foundation_unicode/uniset.h> using namespace icu; using namespace icu::number; diff --git a/icuSources/i18n/number_affixutils.h b/icuSources/i18n/number_affixutils.h index 5cfde61..cdc26a3 100644 --- a/icuSources/i18n/number_affixutils.h +++ b/icuSources/i18n/number_affixutils.h @@ -1,7 +1,7 @@ // © 2017 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #ifndef __NUMBER_AFFIXUTILS_H__ @@ -9,10 +9,10 @@ #include #include "number_types.h" -#include "unicode/stringpiece.h" -#include "unicode/unistr.h" +#include <_foundation_unicode/stringpiece.h> +#include <_foundation_unicode/unistr.h> #include "formatted_string_builder.h" -#include "unicode/uniset.h" +#include <_foundation_unicode/uniset.h> U_NAMESPACE_BEGIN namespace number { namespace impl { diff --git a/icuSources/i18n/number_asformat.cpp b/icuSources/i18n/number_asformat.cpp index 8f2314d..4c58ed6 100644 --- a/icuSources/i18n/number_asformat.cpp +++ b/icuSources/i18n/number_asformat.cpp @@ -1,7 +1,7 @@ // © 2018 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING diff --git a/icuSources/i18n/number_asformat.h b/icuSources/i18n/number_asformat.h index 394b9a8..458795d 100644 --- a/icuSources/i18n/number_asformat.h +++ b/icuSources/i18n/number_asformat.h @@ -1,13 +1,13 @@ // © 2017 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #ifndef __NUMBER_ASFORMAT_H__ #define __NUMBER_ASFORMAT_H__ -#include "unicode/numberformatter.h" +#include <_foundation_unicode/numberformatter.h> #include "number_types.h" #include "number_decimalquantity.h" #include "number_scientific.h" diff --git a/icuSources/i18n/number_capi.cpp b/icuSources/i18n/number_capi.cpp index 42bb05c..3ed194b 100644 --- a/icuSources/i18n/number_capi.cpp +++ b/icuSources/i18n/number_capi.cpp @@ -1,7 +1,7 @@ // © 2018 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING @@ -14,8 +14,8 @@ #include "numparse_types.h" #include "formattedval_impl.h" #include "number_decnum.h" -#include "unicode/numberformatter.h" -#include "unicode/unumberformatter.h" +#include <_foundation_unicode/numberformatter.h> +#include <_foundation_unicode/unumberformatter.h> using namespace icu; using namespace icu::number; diff --git a/icuSources/i18n/number_compact.cpp b/icuSources/i18n/number_compact.cpp index 4dc96e7..9216a8c 100644 --- a/icuSources/i18n/number_compact.cpp +++ b/icuSources/i18n/number_compact.cpp @@ -1,12 +1,12 @@ // © 2017 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/ustring.h" -#include "unicode/ures.h" +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/ures.h> #include "cstring.h" #include "charstr.h" #include "resource.h" diff --git a/icuSources/i18n/number_compact.h b/icuSources/i18n/number_compact.h index fa29744..0d531e1 100644 --- a/icuSources/i18n/number_compact.h +++ b/icuSources/i18n/number_compact.h @@ -1,7 +1,7 @@ // © 2017 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #ifndef __NUMBER_COMPACT_H__ @@ -9,7 +9,7 @@ #include "standardplural.h" #include "number_types.h" -#include "unicode/unum.h" +#include <_foundation_unicode/unum.h> #include "uvector.h" #include "resource.h" #include "number_patternmodifier.h" diff --git a/icuSources/i18n/number_currencysymbols.cpp b/icuSources/i18n/number_currencysymbols.cpp index 8d51275..31b03ca 100644 --- a/icuSources/i18n/number_currencysymbols.cpp +++ b/icuSources/i18n/number_currencysymbols.cpp @@ -1,7 +1,7 @@ // © 2018 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING diff --git a/icuSources/i18n/number_currencysymbols.h b/icuSources/i18n/number_currencysymbols.h index c2223bd..99d5860 100644 --- a/icuSources/i18n/number_currencysymbols.h +++ b/icuSources/i18n/number_currencysymbols.h @@ -1,7 +1,7 @@ // © 2018 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #ifndef __SOURCE_NUMBER_CURRENCYSYMBOLS_H__ diff --git a/icuSources/i18n/number_decimalquantity.cpp b/icuSources/i18n/number_decimalquantity.cpp index b40e127..d8b83d6 100644 --- a/icuSources/i18n/number_decimalquantity.cpp +++ b/icuSources/i18n/number_decimalquantity.cpp @@ -1,7 +1,7 @@ // © 2017 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING @@ -10,7 +10,7 @@ #include #include -#include "unicode/plurrule.h" +#include <_foundation_unicode/plurrule.h> #include "cmemory.h" #include "number_decnum.h" #include "putilimp.h" diff --git a/icuSources/i18n/number_decimalquantity.h b/icuSources/i18n/number_decimalquantity.h index 862addf..858a671 100644 --- a/icuSources/i18n/number_decimalquantity.h +++ b/icuSources/i18n/number_decimalquantity.h @@ -1,14 +1,14 @@ // © 2017 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #ifndef __NUMBER_DECIMALQUANTITY_H__ #define __NUMBER_DECIMALQUANTITY_H__ #include -#include "unicode/umachine.h" +#include <_foundation_unicode/umachine.h> #include "standardplural.h" #include "plurrule_impl.h" #include "number_types.h" diff --git a/icuSources/i18n/number_decimfmtprops.cpp b/icuSources/i18n/number_decimfmtprops.cpp index 15b4169..8148a05 100644 --- a/icuSources/i18n/number_decimfmtprops.cpp +++ b/icuSources/i18n/number_decimfmtprops.cpp @@ -1,7 +1,7 @@ // © 2017 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING diff --git a/icuSources/i18n/number_decimfmtprops.h b/icuSources/i18n/number_decimfmtprops.h index d12c6db..520500b 100644 --- a/icuSources/i18n/number_decimfmtprops.h +++ b/icuSources/i18n/number_decimfmtprops.h @@ -1,18 +1,18 @@ // © 2017 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #ifndef __NUMBER_DECIMFMTPROPS_H__ #define __NUMBER_DECIMFMTPROPS_H__ -#include "unicode/unistr.h" +#include <_foundation_unicode/unistr.h> #include -#include "unicode/plurrule.h" -#include "unicode/currpinf.h" -#include "unicode/unum.h" -#include "unicode/localpointer.h" +#include <_foundation_unicode/plurrule.h> +#include <_foundation_unicode/currpinf.h> +#include <_foundation_unicode/unum.h> +#include <_foundation_unicode/localpointer.h> #include "number_types.h" U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/number_decnum.h b/icuSources/i18n/number_decnum.h index 94a0b31..4c0ae13 100644 --- a/icuSources/i18n/number_decnum.h +++ b/icuSources/i18n/number_decnum.h @@ -1,7 +1,7 @@ // © 2017 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #ifndef __NUMBER_DECNUM_H__ diff --git a/icuSources/i18n/number_fluent.cpp b/icuSources/i18n/number_fluent.cpp index c864ea8..782a9be 100644 --- a/icuSources/i18n/number_fluent.cpp +++ b/icuSources/i18n/number_fluent.cpp @@ -1,12 +1,12 @@ // © 2017 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #include "uassert.h" -#include "unicode/numberformatter.h" +#include <_foundation_unicode/numberformatter.h> #include "number_decimalquantity.h" #include "number_formatimpl.h" #include "umutex.h" diff --git a/icuSources/i18n/number_formatimpl.cpp b/icuSources/i18n/number_formatimpl.cpp index 72dc647..0671f68 100644 --- a/icuSources/i18n/number_formatimpl.cpp +++ b/icuSources/i18n/number_formatimpl.cpp @@ -1,20 +1,20 @@ // © 2017 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #include "cstring.h" -#include "unicode/ures.h" +#include <_foundation_unicode/ures.h> #include "uresimp.h" #include "charstr.h" #include "number_formatimpl.h" -#include "unicode/numfmt.h" +#include <_foundation_unicode/numfmt.h> #include "number_patternstring.h" #include "number_utils.h" -#include "unicode/numberformatter.h" -#include "unicode/dcfmtsym.h" +#include <_foundation_unicode/numberformatter.h> +#include <_foundation_unicode/dcfmtsym.h> #include "number_scientific.h" #include "number_compact.h" #include "uresimp.h" diff --git a/icuSources/i18n/number_formatimpl.h b/icuSources/i18n/number_formatimpl.h index d7be146..9536857 100644 --- a/icuSources/i18n/number_formatimpl.h +++ b/icuSources/i18n/number_formatimpl.h @@ -1,7 +1,7 @@ // © 2017 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #ifndef __NUMBER_FORMATIMPL_H__ diff --git a/icuSources/i18n/number_grouping.cpp b/icuSources/i18n/number_grouping.cpp index a699b4a..e67d0ca 100644 --- a/icuSources/i18n/number_grouping.cpp +++ b/icuSources/i18n/number_grouping.cpp @@ -1,11 +1,11 @@ // © 2017 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/numberformatter.h" +#include <_foundation_unicode/numberformatter.h> #include "number_patternstring.h" #include "uresimp.h" diff --git a/icuSources/i18n/number_integerwidth.cpp b/icuSources/i18n/number_integerwidth.cpp index 10b8534..79972fa 100644 --- a/icuSources/i18n/number_integerwidth.cpp +++ b/icuSources/i18n/number_integerwidth.cpp @@ -1,11 +1,11 @@ // © 2017 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/numberformatter.h" +#include <_foundation_unicode/numberformatter.h> #include "number_types.h" #include "number_decimalquantity.h" diff --git a/icuSources/i18n/number_longnames.cpp b/icuSources/i18n/number_longnames.cpp index be0320c..966adb3 100644 --- a/icuSources/i18n/number_longnames.cpp +++ b/icuSources/i18n/number_longnames.cpp @@ -1,14 +1,14 @@ // © 2017 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #include -#include "unicode/simpleformatter.h" -#include "unicode/ures.h" +#include <_foundation_unicode/simpleformatter.h> +#include <_foundation_unicode/ures.h> #include "ureslocs.h" #include "charstr.h" #include "uresimp.h" diff --git a/icuSources/i18n/number_longnames.h b/icuSources/i18n/number_longnames.h index 0694998..5162bce 100644 --- a/icuSources/i18n/number_longnames.h +++ b/icuSources/i18n/number_longnames.h @@ -1,15 +1,15 @@ // © 2017 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #ifndef __NUMBER_LONGNAMES_H__ #define __NUMBER_LONGNAMES_H__ #include "cmemory.h" -#include "unicode/listformatter.h" -#include "unicode/uversion.h" +#include <_foundation_unicode/listformatter.h> +#include <_foundation_unicode/uversion.h> #include "number_utils.h" #include "number_modifiers.h" diff --git a/icuSources/i18n/number_mapper.cpp b/icuSources/i18n/number_mapper.cpp index 25e542d..bd8a0fe 100644 --- a/icuSources/i18n/number_mapper.cpp +++ b/icuSources/i18n/number_mapper.cpp @@ -1,7 +1,7 @@ // © 2018 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING @@ -11,7 +11,7 @@ #include "number_mapper.h" #include "number_patternstring.h" -#include "unicode/errorcode.h" +#include <_foundation_unicode/errorcode.h> #include "number_utils.h" using namespace icu; diff --git a/icuSources/i18n/number_mapper.h b/icuSources/i18n/number_mapper.h index 8879b7a..3748a39 100644 --- a/icuSources/i18n/number_mapper.h +++ b/icuSources/i18n/number_mapper.h @@ -1,7 +1,7 @@ // © 2018 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #ifndef __NUMBER_MAPPER_H__ @@ -9,7 +9,7 @@ #include #include "number_types.h" -#include "unicode/currpinf.h" +#include <_foundation_unicode/currpinf.h> #include "standardplural.h" #include "number_patternstring.h" #include "number_currencysymbols.h" diff --git a/icuSources/i18n/number_microprops.h b/icuSources/i18n/number_microprops.h index c34e7c1..6443c1a 100644 --- a/icuSources/i18n/number_microprops.h +++ b/icuSources/i18n/number_microprops.h @@ -1,14 +1,14 @@ // © 2017 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #ifndef __NUMBER_MICROPROPS_H__ #define __NUMBER_MICROPROPS_H__ // TODO: minimize includes -#include "unicode/numberformatter.h" +#include <_foundation_unicode/numberformatter.h> #include "number_types.h" #include "number_decimalquantity.h" #include "number_scientific.h" diff --git a/icuSources/i18n/number_modifiers.cpp b/icuSources/i18n/number_modifiers.cpp index 092b66f..15ab906 100644 --- a/icuSources/i18n/number_modifiers.cpp +++ b/icuSources/i18n/number_modifiers.cpp @@ -1,7 +1,7 @@ // © 2017 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING diff --git a/icuSources/i18n/number_modifiers.h b/icuSources/i18n/number_modifiers.h index 09af3f4..825c656 100644 --- a/icuSources/i18n/number_modifiers.h +++ b/icuSources/i18n/number_modifiers.h @@ -1,7 +1,7 @@ // © 2017 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #ifndef __NUMBER_MODIFIERS_H__ @@ -9,8 +9,8 @@ #include #include -#include "unicode/uniset.h" -#include "unicode/simpleformatter.h" +#include <_foundation_unicode/uniset.h> +#include <_foundation_unicode/simpleformatter.h> #include "standardplural.h" #include "formatted_string_builder.h" #include "number_types.h" diff --git a/icuSources/i18n/number_multiplier.cpp b/icuSources/i18n/number_multiplier.cpp index 58e1e44..b794ca1 100644 --- a/icuSources/i18n/number_multiplier.cpp +++ b/icuSources/i18n/number_multiplier.cpp @@ -1,7 +1,7 @@ // © 2018 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING diff --git a/icuSources/i18n/number_multiplier.h b/icuSources/i18n/number_multiplier.h index d8235dc..756df68 100644 --- a/icuSources/i18n/number_multiplier.h +++ b/icuSources/i18n/number_multiplier.h @@ -1,7 +1,7 @@ // © 2018 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #ifndef __SOURCE_NUMBER_MULTIPLIER_H__ diff --git a/icuSources/i18n/number_notation.cpp b/icuSources/i18n/number_notation.cpp index b3cabb5..11fbfcf 100644 --- a/icuSources/i18n/number_notation.cpp +++ b/icuSources/i18n/number_notation.cpp @@ -1,11 +1,11 @@ // © 2017 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/numberformatter.h" +#include <_foundation_unicode/numberformatter.h> #include "number_types.h" using namespace icu; diff --git a/icuSources/i18n/number_output.cpp b/icuSources/i18n/number_output.cpp index 729a2cd..ec45444 100644 --- a/icuSources/i18n/number_output.cpp +++ b/icuSources/i18n/number_output.cpp @@ -1,12 +1,12 @@ // © 2019 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/measunit.h" -#include "unicode/numberformatter.h" +#include <_foundation_unicode/measunit.h> +#include <_foundation_unicode/numberformatter.h> #include "number_utypes.h" #include "util.h" #include "number_decimalquantity.h" diff --git a/icuSources/i18n/number_padding.cpp b/icuSources/i18n/number_padding.cpp index c320c3f..bfe43b7 100644 --- a/icuSources/i18n/number_padding.cpp +++ b/icuSources/i18n/number_padding.cpp @@ -1,11 +1,11 @@ // © 2017 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/numberformatter.h" +#include <_foundation_unicode/numberformatter.h> #include "number_types.h" #include "formatted_string_builder.h" #include "number_decimfmtprops.h" diff --git a/icuSources/i18n/number_patternmodifier.cpp b/icuSources/i18n/number_patternmodifier.cpp index 088a30e..13a5e4c 100644 --- a/icuSources/i18n/number_patternmodifier.cpp +++ b/icuSources/i18n/number_patternmodifier.cpp @@ -1,15 +1,15 @@ // © 2017 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #include "cstring.h" #include "number_patternmodifier.h" -#include "unicode/dcfmtsym.h" -#include "unicode/ucurr.h" -#include "unicode/unistr.h" +#include <_foundation_unicode/dcfmtsym.h> +#include <_foundation_unicode/ucurr.h> +#include <_foundation_unicode/unistr.h> #include "number_microprops.h" using namespace icu; diff --git a/icuSources/i18n/number_patternmodifier.h b/icuSources/i18n/number_patternmodifier.h index 4f825e1..0f24427 100644 --- a/icuSources/i18n/number_patternmodifier.h +++ b/icuSources/i18n/number_patternmodifier.h @@ -1,14 +1,14 @@ // © 2017 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #ifndef __NUMBER_PATTERNMODIFIER_H__ #define __NUMBER_PATTERNMODIFIER_H__ #include "standardplural.h" -#include "unicode/numberformatter.h" +#include <_foundation_unicode/numberformatter.h> #include "number_patternstring.h" #include "number_types.h" #include "number_modifiers.h" diff --git a/icuSources/i18n/number_patternstring.cpp b/icuSources/i18n/number_patternstring.cpp index 96a6fa9..f4fb093 100644 --- a/icuSources/i18n/number_patternstring.cpp +++ b/icuSources/i18n/number_patternstring.cpp @@ -1,7 +1,7 @@ // © 2017 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING @@ -12,7 +12,7 @@ #include "uassert.h" #include "number_patternstring.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/utf16.h> #include "number_utils.h" #include "number_roundingutils.h" #include "number_mapper.h" diff --git a/icuSources/i18n/number_patternstring.h b/icuSources/i18n/number_patternstring.h index 35f4acf..1bc7f23 100644 --- a/icuSources/i18n/number_patternstring.h +++ b/icuSources/i18n/number_patternstring.h @@ -1,7 +1,7 @@ // © 2017 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #ifndef __NUMBER_PATTERNSTRING_H__ @@ -9,8 +9,8 @@ #include -#include "unicode/unum.h" -#include "unicode/unistr.h" +#include <_foundation_unicode/unum.h> +#include <_foundation_unicode/unistr.h> #include "number_types.h" #include "number_decimalquantity.h" #include "number_decimfmtprops.h" diff --git a/icuSources/i18n/number_rounding.cpp b/icuSources/i18n/number_rounding.cpp index 756646b..658715a 100644 --- a/icuSources/i18n/number_rounding.cpp +++ b/icuSources/i18n/number_rounding.cpp @@ -1,13 +1,13 @@ // © 2017 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #include "charstr.h" #include "uassert.h" -#include "unicode/numberformatter.h" +#include <_foundation_unicode/numberformatter.h> #include "number_types.h" #include "number_decimalquantity.h" #include "double-conversion.h" diff --git a/icuSources/i18n/number_roundingutils.h b/icuSources/i18n/number_roundingutils.h index 6657127..b2dbd36 100644 --- a/icuSources/i18n/number_roundingutils.h +++ b/icuSources/i18n/number_roundingutils.h @@ -1,7 +1,7 @@ // © 2017 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #ifndef __NUMBER_ROUNDINGUTILS_H__ diff --git a/icuSources/i18n/number_scientific.cpp b/icuSources/i18n/number_scientific.cpp index d365d98..9da440a 100644 --- a/icuSources/i18n/number_scientific.cpp +++ b/icuSources/i18n/number_scientific.cpp @@ -1,7 +1,7 @@ // © 2017 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING @@ -9,7 +9,7 @@ #include "number_scientific.h" #include "number_utils.h" #include "formatted_string_builder.h" -#include "unicode/unum.h" +#include <_foundation_unicode/unum.h> #include "number_microprops.h" using namespace icu; diff --git a/icuSources/i18n/number_scientific.h b/icuSources/i18n/number_scientific.h index a40a6e4..6d4c32e 100644 --- a/icuSources/i18n/number_scientific.h +++ b/icuSources/i18n/number_scientific.h @@ -1,7 +1,7 @@ // © 2017 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #ifndef __NUMBER_SCIENTIFIC_H__ diff --git a/icuSources/i18n/number_skeletons.cpp b/icuSources/i18n/number_skeletons.cpp index 7f62def..82a66b3 100644 --- a/icuSources/i18n/number_skeletons.cpp +++ b/icuSources/i18n/number_skeletons.cpp @@ -1,7 +1,7 @@ // © 2018 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING @@ -15,14 +15,14 @@ #include "umutex.h" #include "ucln_in.h" #include "patternprops.h" -#include "unicode/ucharstriebuilder.h" +#include <_foundation_unicode/ucharstriebuilder.h> #include "number_utils.h" #include "number_decimalquantity.h" -#include "unicode/numberformatter.h" +#include <_foundation_unicode/numberformatter.h> #include "uinvchar.h" #include "charstr.h" #include "string_segment.h" -#include "unicode/errorcode.h" +#include <_foundation_unicode/errorcode.h> #include "util.h" #include "measunit_impl.h" diff --git a/icuSources/i18n/number_skeletons.h b/icuSources/i18n/number_skeletons.h index 27f69cd..64f2c84 100644 --- a/icuSources/i18n/number_skeletons.h +++ b/icuSources/i18n/number_skeletons.h @@ -1,7 +1,7 @@ // © 2018 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #ifndef __SOURCE_NUMBER_SKELETONS_H__ @@ -9,7 +9,7 @@ #include "number_types.h" #include "numparse_types.h" -#include "unicode/ucharstrie.h" +#include <_foundation_unicode/ucharstrie.h> #include "string_segment.h" U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/number_symbolswrapper.cpp b/icuSources/i18n/number_symbolswrapper.cpp index 204cbaa..bd4ad37 100644 --- a/icuSources/i18n/number_symbolswrapper.cpp +++ b/icuSources/i18n/number_symbolswrapper.cpp @@ -1,12 +1,12 @@ // © 2020 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #include "number_microprops.h" -#include "unicode/numberformatter.h" +#include <_foundation_unicode/numberformatter.h> using namespace icu; using namespace icu::number; diff --git a/icuSources/i18n/number_types.h b/icuSources/i18n/number_types.h index 84846ef..6fccc6a 100644 --- a/icuSources/i18n/number_types.h +++ b/icuSources/i18n/number_types.h @@ -1,21 +1,21 @@ // © 2017 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #ifndef __NUMBER_TYPES_H__ #define __NUMBER_TYPES_H__ #include -#include "unicode/decimfmt.h" -#include "unicode/unum.h" -#include "unicode/numsys.h" -#include "unicode/numberformatter.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/decimfmt.h> +#include <_foundation_unicode/unum.h> +#include <_foundation_unicode/numsys.h> +#include <_foundation_unicode/numberformatter.h> +#include <_foundation_unicode/utf16.h> #include "uassert.h" -#include "unicode/platform.h" -#include "unicode/uniset.h" +#include <_foundation_unicode/platform.h> +#include <_foundation_unicode/uniset.h> #include "standardplural.h" #include "formatted_string_builder.h" diff --git a/icuSources/i18n/number_usageprefs.cpp b/icuSources/i18n/number_usageprefs.cpp index 26fdfaf..ae70167 100644 --- a/icuSources/i18n/number_usageprefs.cpp +++ b/icuSources/i18n/number_usageprefs.cpp @@ -1,7 +1,7 @@ // © 2020 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING @@ -11,14 +11,14 @@ #include "number_microprops.h" #include "number_roundingutils.h" #include "number_skeletons.h" -#include "unicode/char16ptr.h" -#include "unicode/currunit.h" -#include "unicode/fmtable.h" -#include "unicode/measure.h" -#include "unicode/numberformatter.h" -#include "unicode/platform.h" -#include "unicode/unum.h" -#include "unicode/urename.h" +#include <_foundation_unicode/char16ptr.h> +#include <_foundation_unicode/currunit.h> +#include <_foundation_unicode/fmtable.h> +#include <_foundation_unicode/measure.h> +#include <_foundation_unicode/numberformatter.h> +#include <_foundation_unicode/platform.h> +#include <_foundation_unicode/unum.h> +#include <_foundation_unicode/urename.h> #include "units_data.h" using namespace icu; diff --git a/icuSources/i18n/number_usageprefs.h b/icuSources/i18n/number_usageprefs.h index 7054722..e96ab24 100644 --- a/icuSources/i18n/number_usageprefs.h +++ b/icuSources/i18n/number_usageprefs.h @@ -1,7 +1,7 @@ // © 2020 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #ifndef __NUMBER_USAGEPREFS_H__ @@ -9,12 +9,12 @@ #include "cmemory.h" #include "number_types.h" -#include "unicode/listformatter.h" -#include "unicode/localpointer.h" -#include "unicode/locid.h" -#include "unicode/measunit.h" -#include "unicode/stringpiece.h" -#include "unicode/uobject.h" +#include <_foundation_unicode/listformatter.h> +#include <_foundation_unicode/localpointer.h> +#include <_foundation_unicode/locid.h> +#include <_foundation_unicode/measunit.h> +#include <_foundation_unicode/stringpiece.h> +#include <_foundation_unicode/uobject.h> #include "units_converter.h" #include "units_router.h" diff --git a/icuSources/i18n/number_utils.cpp b/icuSources/i18n/number_utils.cpp index 731706a..cd6c270 100644 --- a/icuSources/i18n/number_utils.cpp +++ b/icuSources/i18n/number_utils.cpp @@ -1,7 +1,7 @@ // © 2018 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING diff --git a/icuSources/i18n/number_utils.h b/icuSources/i18n/number_utils.h index bc369c9..9a11e94 100644 --- a/icuSources/i18n/number_utils.h +++ b/icuSources/i18n/number_utils.h @@ -1,13 +1,13 @@ // © 2017 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #ifndef __NUMBER_UTILS_H__ #define __NUMBER_UTILS_H__ -#include "unicode/numberformatter.h" +#include <_foundation_unicode/numberformatter.h> #include "number_types.h" #include "number_decimalquantity.h" #include "number_scientific.h" diff --git a/icuSources/i18n/number_utypes.h b/icuSources/i18n/number_utypes.h index 50c8617..360eba5 100644 --- a/icuSources/i18n/number_utypes.h +++ b/icuSources/i18n/number_utypes.h @@ -1,13 +1,13 @@ // © 2018 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #ifndef __SOURCE_NUMBER_UTYPES_H__ #define __SOURCE_NUMBER_UTYPES_H__ -#include "unicode/numberformatter.h" +#include <_foundation_unicode/numberformatter.h> #include "number_types.h" #include "number_decimalquantity.h" #include "formatted_string_builder.h" diff --git a/icuSources/i18n/numfmt.cpp b/icuSources/i18n/numfmt.cpp index fb05660..5cf3e87 100644 --- a/icuSources/i18n/numfmt.cpp +++ b/icuSources/i18n/numfmt.cpp @@ -24,21 +24,21 @@ ******************************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/numfmt.h" -#include "unicode/locid.h" -#include "unicode/dcfmtsym.h" -#include "unicode/decimfmt.h" -#include "unicode/ustring.h" -#include "unicode/ucurr.h" -#include "unicode/curramt.h" -#include "unicode/numsys.h" -#include "unicode/rbnf.h" -#include "unicode/localpointer.h" -#include "unicode/udisplaycontext.h" +#include <_foundation_unicode/numfmt.h> +#include <_foundation_unicode/locid.h> +#include <_foundation_unicode/dcfmtsym.h> +#include <_foundation_unicode/decimfmt.h> +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/ucurr.h> +#include <_foundation_unicode/curramt.h> +#include <_foundation_unicode/numsys.h> +#include <_foundation_unicode/rbnf.h> +#include <_foundation_unicode/localpointer.h> +#include <_foundation_unicode/udisplaycontext.h> #include "charstr.h" #include "winnmfmt.h" #include "uresimp.h" diff --git a/icuSources/i18n/numparse_affixes.cpp b/icuSources/i18n/numparse_affixes.cpp index ad3d48b..a94bfa9 100644 --- a/icuSources/i18n/numparse_affixes.cpp +++ b/icuSources/i18n/numparse_affixes.cpp @@ -1,7 +1,7 @@ // © 2018 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING diff --git a/icuSources/i18n/numparse_affixes.h b/icuSources/i18n/numparse_affixes.h index ad731ed..36c536f 100644 --- a/icuSources/i18n/numparse_affixes.h +++ b/icuSources/i18n/numparse_affixes.h @@ -1,7 +1,7 @@ // © 2018 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #ifndef __NUMPARSE_AFFIXES_H__ diff --git a/icuSources/i18n/numparse_compositions.cpp b/icuSources/i18n/numparse_compositions.cpp index 2f7e1ab..da54372 100644 --- a/icuSources/i18n/numparse_compositions.cpp +++ b/icuSources/i18n/numparse_compositions.cpp @@ -1,7 +1,7 @@ // © 2018 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING @@ -12,7 +12,7 @@ #include "numparse_types.h" #include "numparse_compositions.h" #include "string_segment.h" -#include "unicode/uniset.h" +#include <_foundation_unicode/uniset.h> using namespace icu; using namespace icu::numparse; diff --git a/icuSources/i18n/numparse_compositions.h b/icuSources/i18n/numparse_compositions.h index f085912..f68a58e 100644 --- a/icuSources/i18n/numparse_compositions.h +++ b/icuSources/i18n/numparse_compositions.h @@ -1,7 +1,7 @@ // © 2018 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #ifndef __SOURCE_NUMPARSE_COMPOSITIONS__ diff --git a/icuSources/i18n/numparse_currency.cpp b/icuSources/i18n/numparse_currency.cpp index 7bbb060..12bdb50 100644 --- a/icuSources/i18n/numparse_currency.cpp +++ b/icuSources/i18n/numparse_currency.cpp @@ -1,7 +1,7 @@ // © 2018 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING @@ -12,7 +12,7 @@ #include "numparse_types.h" #include "numparse_currency.h" #include "ucurrimp.h" -#include "unicode/errorcode.h" +#include <_foundation_unicode/errorcode.h> #include "numparse_utils.h" #include "string_segment.h" diff --git a/icuSources/i18n/numparse_currency.h b/icuSources/i18n/numparse_currency.h index a949433..40949c9 100644 --- a/icuSources/i18n/numparse_currency.h +++ b/icuSources/i18n/numparse_currency.h @@ -1,7 +1,7 @@ // © 2018 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #ifndef __NUMPARSE_CURRENCY_H__ @@ -11,7 +11,7 @@ #include "numparse_compositions.h" #include "charstr.h" #include "number_currencysymbols.h" -#include "unicode/uniset.h" +#include <_foundation_unicode/uniset.h> U_NAMESPACE_BEGIN namespace numparse { namespace impl { diff --git a/icuSources/i18n/numparse_decimal.cpp b/icuSources/i18n/numparse_decimal.cpp index bf06527..a398b13 100644 --- a/icuSources/i18n/numparse_decimal.cpp +++ b/icuSources/i18n/numparse_decimal.cpp @@ -1,7 +1,7 @@ // © 2018 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING @@ -13,7 +13,7 @@ #include "numparse_decimal.h" #include "static_unicode_sets.h" #include "numparse_utils.h" -#include "unicode/uchar.h" +#include <_foundation_unicode/uchar.h> #include "putilimp.h" #include "number_decimalquantity.h" #include "string_segment.h" diff --git a/icuSources/i18n/numparse_decimal.h b/icuSources/i18n/numparse_decimal.h index 07c9afe..d8da946 100644 --- a/icuSources/i18n/numparse_decimal.h +++ b/icuSources/i18n/numparse_decimal.h @@ -1,13 +1,13 @@ // © 2018 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #ifndef __NUMPARSE_DECIMAL_H__ #define __NUMPARSE_DECIMAL_H__ -#include "unicode/uniset.h" +#include <_foundation_unicode/uniset.h> #include "numparse_types.h" U_NAMESPACE_BEGIN namespace numparse { diff --git a/icuSources/i18n/numparse_impl.cpp b/icuSources/i18n/numparse_impl.cpp index 91c6074..4c1ba06 100644 --- a/icuSources/i18n/numparse_impl.cpp +++ b/icuSources/i18n/numparse_impl.cpp @@ -1,7 +1,7 @@ // © 2018 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING @@ -17,7 +17,7 @@ #include "numparse_impl.h" #include "numparse_symbols.h" #include "numparse_decimal.h" -#include "unicode/numberformatter.h" +#include <_foundation_unicode/numberformatter.h> #include "cstr.h" #include "number_mapper.h" #include "static_unicode_sets.h" diff --git a/icuSources/i18n/numparse_impl.h b/icuSources/i18n/numparse_impl.h index 380d9aa..9bd0784 100644 --- a/icuSources/i18n/numparse_impl.h +++ b/icuSources/i18n/numparse_impl.h @@ -1,7 +1,7 @@ // © 2018 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #ifndef __NUMPARSE_IMPL_H__ @@ -11,11 +11,11 @@ #include "numparse_decimal.h" #include "numparse_symbols.h" #include "numparse_scientific.h" -#include "unicode/uniset.h" +#include <_foundation_unicode/uniset.h> #include "numparse_currency.h" #include "numparse_affixes.h" #include "number_decimfmtprops.h" -#include "unicode/localpointer.h" +#include <_foundation_unicode/localpointer.h> #include "numparse_validators.h" #include "number_multiplier.h" #include "string_segment.h" diff --git a/icuSources/i18n/numparse_parsednumber.cpp b/icuSources/i18n/numparse_parsednumber.cpp index 4b373a3..d70631c 100644 --- a/icuSources/i18n/numparse_parsednumber.cpp +++ b/icuSources/i18n/numparse_parsednumber.cpp @@ -1,7 +1,7 @@ // © 2018 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING diff --git a/icuSources/i18n/numparse_scientific.cpp b/icuSources/i18n/numparse_scientific.cpp index 4b88cd9..912e980 100644 --- a/icuSources/i18n/numparse_scientific.cpp +++ b/icuSources/i18n/numparse_scientific.cpp @@ -1,7 +1,7 @@ // © 2018 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING diff --git a/icuSources/i18n/numparse_scientific.h b/icuSources/i18n/numparse_scientific.h index 5617c0c..3c62663 100644 --- a/icuSources/i18n/numparse_scientific.h +++ b/icuSources/i18n/numparse_scientific.h @@ -1,7 +1,7 @@ // © 2018 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #ifndef __NUMPARSE_SCIENTIFIC_H__ @@ -10,7 +10,7 @@ #include "numparse_types.h" #include "numparse_decimal.h" #include "numparse_symbols.h" -#include "unicode/numberformatter.h" +#include <_foundation_unicode/numberformatter.h> using icu::number::impl::Grouper; diff --git a/icuSources/i18n/numparse_symbols.cpp b/icuSources/i18n/numparse_symbols.cpp index 608f4f5..25f8c5f 100644 --- a/icuSources/i18n/numparse_symbols.cpp +++ b/icuSources/i18n/numparse_symbols.cpp @@ -1,7 +1,7 @@ // © 2018 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING diff --git a/icuSources/i18n/numparse_symbols.h b/icuSources/i18n/numparse_symbols.h index beb133f..dbb9420 100644 --- a/icuSources/i18n/numparse_symbols.h +++ b/icuSources/i18n/numparse_symbols.h @@ -1,14 +1,14 @@ // © 2018 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #ifndef __NUMPARSE_SYMBOLS_H__ #define __NUMPARSE_SYMBOLS_H__ #include "numparse_types.h" -#include "unicode/uniset.h" +#include <_foundation_unicode/uniset.h> #include "static_unicode_sets.h" U_NAMESPACE_BEGIN namespace numparse { diff --git a/icuSources/i18n/numparse_types.h b/icuSources/i18n/numparse_types.h index 623f0e8..4623d30 100644 --- a/icuSources/i18n/numparse_types.h +++ b/icuSources/i18n/numparse_types.h @@ -1,13 +1,13 @@ // © 2018 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #ifndef __NUMPARSE_TYPES_H__ #define __NUMPARSE_TYPES_H__ -#include "unicode/uobject.h" +#include <_foundation_unicode/uobject.h> #include "number_decimalquantity.h" #include "string_segment.h" diff --git a/icuSources/i18n/numparse_utils.h b/icuSources/i18n/numparse_utils.h index 162954b..6e0edf0 100644 --- a/icuSources/i18n/numparse_utils.h +++ b/icuSources/i18n/numparse_utils.h @@ -1,14 +1,14 @@ // © 2018 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #ifndef __NUMPARSE_UTILS_H__ #define __NUMPARSE_UTILS_H__ #include "numparse_types.h" -#include "unicode/uniset.h" +#include <_foundation_unicode/uniset.h> U_NAMESPACE_BEGIN namespace numparse { namespace impl { diff --git a/icuSources/i18n/numparse_validators.cpp b/icuSources/i18n/numparse_validators.cpp index 12d3465..a382822 100644 --- a/icuSources/i18n/numparse_validators.cpp +++ b/icuSources/i18n/numparse_validators.cpp @@ -1,7 +1,7 @@ // © 2018 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING diff --git a/icuSources/i18n/numparse_validators.h b/icuSources/i18n/numparse_validators.h index 5d43b77..4d574c4 100644 --- a/icuSources/i18n/numparse_validators.h +++ b/icuSources/i18n/numparse_validators.h @@ -1,7 +1,7 @@ // © 2018 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #ifndef __SOURCE_NUMPARSE_VALIDATORS_H__ diff --git a/icuSources/i18n/numrange_capi.cpp b/icuSources/i18n/numrange_capi.cpp index bd3a9ef..0856f76 100644 --- a/icuSources/i18n/numrange_capi.cpp +++ b/icuSources/i18n/numrange_capi.cpp @@ -1,7 +1,7 @@ // © 2018 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING @@ -15,8 +15,8 @@ #include "formattedval_impl.h" #include "numrange_impl.h" #include "number_decnum.h" -#include "unicode/numberrangeformatter.h" -#include "unicode/unumberrangeformatter.h" +#include <_foundation_unicode/numberrangeformatter.h> +#include <_foundation_unicode/unumberrangeformatter.h> using namespace icu; using namespace icu::number; diff --git a/icuSources/i18n/numrange_fluent.cpp b/icuSources/i18n/numrange_fluent.cpp index c36defa..ca39609 100644 --- a/icuSources/i18n/numrange_fluent.cpp +++ b/icuSources/i18n/numrange_fluent.cpp @@ -1,7 +1,7 @@ // © 2018 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING diff --git a/icuSources/i18n/numrange_impl.cpp b/icuSources/i18n/numrange_impl.cpp index 06efc7b..a4a8f3c 100644 --- a/icuSources/i18n/numrange_impl.cpp +++ b/icuSources/i18n/numrange_impl.cpp @@ -1,7 +1,7 @@ // © 2018 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING @@ -9,7 +9,7 @@ // Helpful in toString methods and elsewhere. #define UNISTR_FROM_STRING_EXPLICIT -#include "unicode/numberrangeformatter.h" +#include <_foundation_unicode/numberrangeformatter.h> #include "numrange_impl.h" #include "patternprops.h" #include "pluralranges.h" diff --git a/icuSources/i18n/numrange_impl.h b/icuSources/i18n/numrange_impl.h index ac1d8a5..bf430ef 100644 --- a/icuSources/i18n/numrange_impl.h +++ b/icuSources/i18n/numrange_impl.h @@ -1,15 +1,15 @@ // © 2018 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #ifndef __SOURCE_NUMRANGE_TYPES_H__ #define __SOURCE_NUMRANGE_TYPES_H__ -#include "unicode/numberformatter.h" -#include "unicode/numberrangeformatter.h" -#include "unicode/simpleformatter.h" +#include <_foundation_unicode/numberformatter.h> +#include <_foundation_unicode/numberrangeformatter.h> +#include <_foundation_unicode/simpleformatter.h> #include "number_types.h" #include "number_decimalquantity.h" #include "number_formatimpl.h" diff --git a/icuSources/i18n/numsys.cpp b/icuSources/i18n/numsys.cpp index 015d2a4..c1f225b 100644 --- a/icuSources/i18n/numsys.cpp +++ b/icuSources/i18n/numsys.cpp @@ -15,15 +15,15 @@ ******************************************************************************** */ -#include "unicode/utypes.h" -#include "unicode/localpointer.h" -#include "unicode/uchar.h" -#include "unicode/unistr.h" -#include "unicode/ures.h" -#include "unicode/ustring.h" -#include "unicode/uloc.h" -#include "unicode/schriter.h" -#include "unicode/numsys.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/localpointer.h> +#include <_foundation_unicode/uchar.h> +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/ures.h> +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/uloc.h> +#include <_foundation_unicode/schriter.h> +#include <_foundation_unicode/numsys.h> #include "cstring.h" #include "uassert.h" #include "ucln_in.h" diff --git a/icuSources/i18n/numsys_impl.h b/icuSources/i18n/numsys_impl.h index e76e634..646b000 100644 --- a/icuSources/i18n/numsys_impl.h +++ b/icuSources/i18n/numsys_impl.h @@ -14,13 +14,13 @@ #ifndef __NUMSYS_IMPL_H__ #define __NUMSYS_IMPL_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/numsys.h" +#include <_foundation_unicode/numsys.h> #include "uvector.h" -#include "unicode/strenum.h" +#include <_foundation_unicode/strenum.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/olsontz.cpp b/icuSources/i18n/olsontz.cpp index e5c60f8..6650941 100644 --- a/icuSources/i18n/olsontz.cpp +++ b/icuSources/i18n/olsontz.cpp @@ -17,9 +17,9 @@ #if !UCONFIG_NO_FORMATTING -#include "unicode/ures.h" -#include "unicode/simpletz.h" -#include "unicode/gregocal.h" +#include <_foundation_unicode/ures.h> +#include <_foundation_unicode/simpletz.h> +#include <_foundation_unicode/gregocal.h> #include "gregoimp.h" #include "cmemory.h" #include "uassert.h" diff --git a/icuSources/i18n/olsontz.h b/icuSources/i18n/olsontz.h index 02d71e9..59e5f8d 100644 --- a/icuSources/i18n/olsontz.h +++ b/icuSources/i18n/olsontz.h @@ -13,11 +13,11 @@ #ifndef OLSONTZ_H #define OLSONTZ_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/basictz.h" +#include <_foundation_unicode/basictz.h> #include "umutex.h" struct UResourceBundle; diff --git a/icuSources/i18n/persncal.h b/icuSources/i18n/persncal.h index d0f2ee5..31073c7 100644 --- a/icuSources/i18n/persncal.h +++ b/icuSources/i18n/persncal.h @@ -18,11 +18,11 @@ #ifndef PERSNCAL_H #define PERSNCAL_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/calendar.h" +#include <_foundation_unicode/calendar.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/pluralranges.cpp b/icuSources/i18n/pluralranges.cpp index da10e21..733b7d9 100644 --- a/icuSources/i18n/pluralranges.cpp +++ b/icuSources/i18n/pluralranges.cpp @@ -1,7 +1,7 @@ // © 2018 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING @@ -9,7 +9,7 @@ // Helpful in toString methods and elsewhere. #define UNISTR_FROM_STRING_EXPLICIT -#include "unicode/numberrangeformatter.h" +#include <_foundation_unicode/numberrangeformatter.h> #include "pluralranges.h" #include "uresimp.h" #include "charstr.h" diff --git a/icuSources/i18n/pluralranges.h b/icuSources/i18n/pluralranges.h index eba59c7..f1ef082 100644 --- a/icuSources/i18n/pluralranges.h +++ b/icuSources/i18n/pluralranges.h @@ -4,13 +4,13 @@ #ifndef __PLURALRANGES_H__ #define __PLURALRANGES_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/uobject.h" -#include "unicode/locid.h" -#include "unicode/plurrule.h" +#include <_foundation_unicode/uobject.h> +#include <_foundation_unicode/locid.h> +#include <_foundation_unicode/plurrule.h> #include "standardplural.h" #include "cmemory.h" diff --git a/icuSources/i18n/plurfmt.cpp b/icuSources/i18n/plurfmt.cpp index 3b8f3a6..a3a28a1 100644 --- a/icuSources/i18n/plurfmt.cpp +++ b/icuSources/i18n/plurfmt.cpp @@ -10,11 +10,11 @@ ******************************************************************************* */ -#include "unicode/decimfmt.h" -#include "unicode/messagepattern.h" -#include "unicode/plurfmt.h" -#include "unicode/plurrule.h" -#include "unicode/utypes.h" +#include <_foundation_unicode/decimfmt.h> +#include <_foundation_unicode/messagepattern.h> +#include <_foundation_unicode/plurfmt.h> +#include <_foundation_unicode/plurrule.h> +#include <_foundation_unicode/utypes.h> #include "cmemory.h" #include "messageimpl.h" #include "nfrule.h" diff --git a/icuSources/i18n/plurrule.cpp b/icuSources/i18n/plurrule.cpp index b57e449..d8477a1 100644 --- a/icuSources/i18n/plurrule.cpp +++ b/icuSources/i18n/plurrule.cpp @@ -12,14 +12,14 @@ #include #include -#include "unicode/utypes.h" -#include "unicode/localpointer.h" -#include "unicode/plurrule.h" -#include "unicode/upluralrules.h" -#include "unicode/ures.h" -#include "unicode/numfmt.h" -#include "unicode/decimfmt.h" -#include "unicode/numberrangeformatter.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/localpointer.h> +#include <_foundation_unicode/plurrule.h> +#include <_foundation_unicode/upluralrules.h> +#include <_foundation_unicode/ures.h> +#include <_foundation_unicode/numfmt.h> +#include <_foundation_unicode/decimfmt.h> +#include <_foundation_unicode/numberrangeformatter.h> #include "charstr.h" #include "cmemory.h" #include "cstring.h" diff --git a/icuSources/i18n/plurrule_impl.h b/icuSources/i18n/plurrule_impl.h index c27b655..6e0ba88 100644 --- a/icuSources/i18n/plurrule_impl.h +++ b/icuSources/i18n/plurrule_impl.h @@ -17,15 +17,15 @@ // Internal definitions for the PluralRules implementation. -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/format.h" -#include "unicode/locid.h" -#include "unicode/parseerr.h" -#include "unicode/strenum.h" -#include "unicode/ures.h" +#include <_foundation_unicode/format.h> +#include <_foundation_unicode/locid.h> +#include <_foundation_unicode/parseerr.h> +#include <_foundation_unicode/strenum.h> +#include <_foundation_unicode/ures.h> #include "uvector.h" #include "hash.h" #include "uassert.h" diff --git a/icuSources/i18n/quant.cpp b/icuSources/i18n/quant.cpp index ed33933..466c132 100644 --- a/icuSources/i18n/quant.cpp +++ b/icuSources/i18n/quant.cpp @@ -10,12 +10,12 @@ ********************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_TRANSLITERATION #include "quant.h" -#include "unicode/unistr.h" +#include <_foundation_unicode/unistr.h> #include "util.h" U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/quant.h b/icuSources/i18n/quant.h index 427a6b0..a219c4e 100644 --- a/icuSources/i18n/quant.h +++ b/icuSources/i18n/quant.h @@ -12,12 +12,12 @@ #ifndef QUANT_H #define QUANT_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_TRANSLITERATION -#include "unicode/unifunct.h" -#include "unicode/unimatch.h" +#include <_foundation_unicode/unifunct.h> +#include <_foundation_unicode/unimatch.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/quantityformatter.cpp b/icuSources/i18n/quantityformatter.cpp index 7b4d51e..d3ea04f 100644 --- a/icuSources/i18n/quantityformatter.cpp +++ b/icuSources/i18n/quantityformatter.cpp @@ -8,20 +8,20 @@ * quantityformatter.cpp */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/simpleformatter.h" +#include <_foundation_unicode/simpleformatter.h> #include "quantityformatter.h" #include "uassert.h" -#include "unicode/unistr.h" -#include "unicode/decimfmt.h" +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/decimfmt.h> #include "cstring.h" -#include "unicode/plurrule.h" +#include <_foundation_unicode/plurrule.h> #include "charstr.h" -#include "unicode/fmtable.h" -#include "unicode/fieldpos.h" +#include <_foundation_unicode/fmtable.h> +#include <_foundation_unicode/fieldpos.h> #include "standardplural.h" #include "uassert.h" #include "number_decimalquantity.h" diff --git a/icuSources/i18n/quantityformatter.h b/icuSources/i18n/quantityformatter.h index 841798c..24fea1e 100644 --- a/icuSources/i18n/quantityformatter.h +++ b/icuSources/i18n/quantityformatter.h @@ -11,8 +11,8 @@ #ifndef __QUANTITY_FORMATTER_H__ #define __QUANTITY_FORMATTER_H__ -#include "unicode/utypes.h" -#include "unicode/uobject.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/uobject.h> #if !UCONFIG_NO_FORMATTING diff --git a/icuSources/i18n/rbnf.cpp b/icuSources/i18n/rbnf.cpp index b6f4a09..09c85f7 100644 --- a/icuSources/i18n/rbnf.cpp +++ b/icuSources/i18n/rbnf.cpp @@ -7,27 +7,27 @@ ******************************************************************************* */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #include "utypeinfo.h" // for 'typeid' to work -#include "unicode/rbnf.h" +#include <_foundation_unicode/rbnf.h> #if U_HAVE_RBNF -#include "unicode/normlzr.h" -#include "unicode/plurfmt.h" -#include "unicode/tblcoll.h" -#include "unicode/uchar.h" -#include "unicode/ucol.h" -#include "unicode/uloc.h" -#include "unicode/unum.h" -#include "unicode/ures.h" -#include "unicode/ustring.h" -#include "unicode/utf16.h" -#include "unicode/udata.h" -#include "unicode/udisplaycontext.h" -#include "unicode/brkiter.h" -#include "unicode/ucasemap.h" +#include <_foundation_unicode/normlzr.h> +#include <_foundation_unicode/plurfmt.h> +#include <_foundation_unicode/tblcoll.h> +#include <_foundation_unicode/uchar.h> +#include <_foundation_unicode/ucol.h> +#include <_foundation_unicode/uloc.h> +#include <_foundation_unicode/unum.h> +#include <_foundation_unicode/ures.h> +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/utf16.h> +#include <_foundation_unicode/udata.h> +#include <_foundation_unicode/udisplaycontext.h> +#include <_foundation_unicode/brkiter.h> +#include <_foundation_unicode/ucasemap.h> #include "cmemory.h" #include "cstring.h" diff --git a/icuSources/i18n/rbt.cpp b/icuSources/i18n/rbt.cpp index 86d6cbd..8d6a7e7 100644 --- a/icuSources/i18n/rbt.cpp +++ b/icuSources/i18n/rbt.cpp @@ -10,12 +10,12 @@ ********************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_TRANSLITERATION -#include "unicode/rep.h" -#include "unicode/uniset.h" +#include <_foundation_unicode/rep.h> +#include <_foundation_unicode/uniset.h> #include "rbt_pars.h" #include "rbt_data.h" #include "rbt_rule.h" diff --git a/icuSources/i18n/rbt.h b/icuSources/i18n/rbt.h index 8a43c90..e8f8215 100644 --- a/icuSources/i18n/rbt.h +++ b/icuSources/i18n/rbt.h @@ -12,14 +12,14 @@ #ifndef RBT_H #define RBT_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_TRANSLITERATION -#include "unicode/translit.h" -#include "unicode/utypes.h" -#include "unicode/parseerr.h" -#include "unicode/udata.h" +#include <_foundation_unicode/translit.h> +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/parseerr.h> +#include <_foundation_unicode/udata.h> #define U_ICUDATA_TRANSLIT U_ICUDATA_NAME U_TREE_SEPARATOR_STRING "translit" diff --git a/icuSources/i18n/rbt_data.cpp b/icuSources/i18n/rbt_data.cpp index 866f0c2..e4436b3 100644 --- a/icuSources/i18n/rbt_data.cpp +++ b/icuSources/i18n/rbt_data.cpp @@ -10,13 +10,13 @@ ********************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #include "umutex.h" #if !UCONFIG_NO_TRANSLITERATION -#include "unicode/unistr.h" -#include "unicode/uniset.h" +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/uniset.h> #include "rbt_data.h" #include "hash.h" #include "cmemory.h" diff --git a/icuSources/i18n/rbt_data.h b/icuSources/i18n/rbt_data.h index 52a961d..8f81f45 100644 --- a/icuSources/i18n/rbt_data.h +++ b/icuSources/i18n/rbt_data.h @@ -12,12 +12,12 @@ #ifndef RBT_DATA_H #define RBT_DATA_H -#include "unicode/utypes.h" -#include "unicode/uclean.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/uclean.h> #if !UCONFIG_NO_TRANSLITERATION -#include "unicode/uobject.h" +#include <_foundation_unicode/uobject.h> #include "rbt_set.h" #include "hash.h" diff --git a/icuSources/i18n/rbt_pars.cpp b/icuSources/i18n/rbt_pars.cpp index f13bf1c..8dec327 100644 --- a/icuSources/i18n/rbt_pars.cpp +++ b/icuSources/i18n/rbt_pars.cpp @@ -10,18 +10,18 @@ ********************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_TRANSLITERATION -#include "unicode/uobject.h" -#include "unicode/parseerr.h" -#include "unicode/parsepos.h" -#include "unicode/putil.h" -#include "unicode/uchar.h" -#include "unicode/ustring.h" -#include "unicode/uniset.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/uobject.h> +#include <_foundation_unicode/parseerr.h> +#include <_foundation_unicode/parsepos.h> +#include <_foundation_unicode/putil.h> +#include <_foundation_unicode/uchar.h> +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/uniset.h> +#include <_foundation_unicode/utf16.h> #include "cstring.h" #include "funcrepl.h" #include "hash.h" @@ -32,7 +32,7 @@ #include "rbt_rule.h" #include "strmatch.h" #include "strrepl.h" -#include "unicode/symtable.h" +#include <_foundation_unicode/symtable.h> #include "tridpars.h" #include "uvector.h" #include "hash.h" diff --git a/icuSources/i18n/rbt_pars.h b/icuSources/i18n/rbt_pars.h index d1a4cd6..67f8fd8 100644 --- a/icuSources/i18n/rbt_pars.h +++ b/icuSources/i18n/rbt_pars.h @@ -12,14 +12,14 @@ #ifndef RBT_PARS_H #define RBT_PARS_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_TRANSLITERATION #ifdef __cplusplus -#include "unicode/uobject.h" -#include "unicode/parseerr.h" -#include "unicode/unorm.h" +#include <_foundation_unicode/uobject.h> +#include <_foundation_unicode/parseerr.h> +#include <_foundation_unicode/unorm.h> #include "rbt.h" #include "hash.h" #include "uvector.h" diff --git a/icuSources/i18n/rbt_rule.cpp b/icuSources/i18n/rbt_rule.cpp index ee0d938..2e1abc9 100644 --- a/icuSources/i18n/rbt_rule.cpp +++ b/icuSources/i18n/rbt_rule.cpp @@ -10,14 +10,14 @@ ********************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_TRANSLITERATION -#include "unicode/rep.h" -#include "unicode/unifilt.h" -#include "unicode/uniset.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/rep.h> +#include <_foundation_unicode/unifilt.h> +#include <_foundation_unicode/uniset.h> +#include <_foundation_unicode/utf16.h> #include "rbt_rule.h" #include "rbt_data.h" #include "cmemory.h" diff --git a/icuSources/i18n/rbt_rule.h b/icuSources/i18n/rbt_rule.h index b927f5d..aa471f7 100644 --- a/icuSources/i18n/rbt_rule.h +++ b/icuSources/i18n/rbt_rule.h @@ -10,14 +10,14 @@ #ifndef RBT_RULE_H #define RBT_RULE_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_TRANSLITERATION -#include "unicode/uobject.h" -#include "unicode/unistr.h" -#include "unicode/utrans.h" -#include "unicode/unimatch.h" +#include <_foundation_unicode/uobject.h> +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/utrans.h> +#include <_foundation_unicode/unimatch.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/rbt_set.cpp b/icuSources/i18n/rbt_set.cpp index c517467..ea1cc54 100644 --- a/icuSources/i18n/rbt_set.cpp +++ b/icuSources/i18n/rbt_set.cpp @@ -10,13 +10,13 @@ ********************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_TRANSLITERATION -#include "unicode/unistr.h" -#include "unicode/uniset.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/uniset.h> +#include <_foundation_unicode/utf16.h> #include "rbt_set.h" #include "rbt_rule.h" #include "cmemory.h" diff --git a/icuSources/i18n/rbt_set.h b/icuSources/i18n/rbt_set.h index 3a2890e..868fd28 100644 --- a/icuSources/i18n/rbt_set.h +++ b/icuSources/i18n/rbt_set.h @@ -12,12 +12,12 @@ #ifndef RBT_SET_H #define RBT_SET_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_TRANSLITERATION -#include "unicode/uobject.h" -#include "unicode/utrans.h" +#include <_foundation_unicode/uobject.h> +#include <_foundation_unicode/utrans.h> #include "uvector.h" U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/rbtz.cpp b/icuSources/i18n/rbtz.cpp index 0e174ba..8a435d3 100644 --- a/icuSources/i18n/rbtz.cpp +++ b/icuSources/i18n/rbtz.cpp @@ -9,12 +9,12 @@ #include "utypeinfo.h" // for 'typeid' to work -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/rbtz.h" -#include "unicode/gregocal.h" +#include <_foundation_unicode/rbtz.h> +#include <_foundation_unicode/gregocal.h> #include "uvector.h" #include "gregoimp.h" #include "cmemory.h" diff --git a/icuSources/i18n/regexcmp.cpp b/icuSources/i18n/regexcmp.cpp index 4b50700..d8f426b 100644 --- a/icuSources/i18n/regexcmp.cpp +++ b/icuSources/i18n/regexcmp.cpp @@ -11,20 +11,20 @@ // is used by the match finding engine. // -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_REGULAR_EXPRESSIONS -#include "unicode/ustring.h" -#include "unicode/unistr.h" -#include "unicode/uniset.h" -#include "unicode/uchar.h" -#include "unicode/uchriter.h" -#include "unicode/parsepos.h" -#include "unicode/parseerr.h" -#include "unicode/regex.h" -#include "unicode/utf.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/uniset.h> +#include <_foundation_unicode/uchar.h> +#include <_foundation_unicode/uchriter.h> +#include <_foundation_unicode/parsepos.h> +#include <_foundation_unicode/parseerr.h> +#include <_foundation_unicode/regex.h> +#include <_foundation_unicode/utf.h> +#include <_foundation_unicode/utf16.h> #include "patternprops.h" #include "putilimp.h" #include "cmemory.h" @@ -3913,7 +3913,7 @@ void RegexCompile::error(UErrorCode e) { if (U_SUCCESS(*fStatus) || e == U_MEMORY_ALLOCATION_ERROR) { *fStatus = e; // Hmm. fParseErr (UParseError) line & offset fields are int32_t in public - // API (see common/unicode/parseerr.h), while fLineNum and fCharNum are + // API (see common/_foundation_unicode/parseerr.h), while fLineNum and fCharNum are // int64_t. If the values of the latter are out of range for the former, // set them to the appropriate "field not supported" values. if (fLineNum > 0x7FFFFFFF) { diff --git a/icuSources/i18n/regexcmp.h b/icuSources/i18n/regexcmp.h index 81ac9e5..fe180ab 100644 --- a/icuSources/i18n/regexcmp.h +++ b/icuSources/i18n/regexcmp.h @@ -9,20 +9,20 @@ // This file contains declarations for the class RegexCompile // // This class is internal to the regular expression implementation. -// For the public Regular Expression API, see the file "unicode/regex.h" +// For the public Regular Expression API, see the file "_foundation_unicode/regex.h" // #ifndef RBBISCAN_H #define RBBISCAN_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_REGULAR_EXPRESSIONS -#include "unicode/parseerr.h" -#include "unicode/uniset.h" -#include "unicode/uobject.h" -#include "unicode/utext.h" +#include <_foundation_unicode/parseerr.h> +#include <_foundation_unicode/uniset.h> +#include <_foundation_unicode/uobject.h> +#include <_foundation_unicode/utext.h> #include "uhash.h" #include "uvector.h" #include "uvectr32.h" diff --git a/icuSources/i18n/regexcst.h b/icuSources/i18n/regexcst.h index a475b6b..629da87 100644 --- a/icuSources/i18n/regexcst.h +++ b/icuSources/i18n/regexcst.h @@ -14,7 +14,7 @@ #ifndef RBBIRPT_H #define RBBIRPT_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> U_NAMESPACE_BEGIN // diff --git a/icuSources/i18n/regeximp.cpp b/icuSources/i18n/regeximp.cpp index d555669..5611014 100644 --- a/icuSources/i18n/regeximp.cpp +++ b/icuSources/i18n/regeximp.cpp @@ -10,11 +10,11 @@ // miscellaneous implementation functions. // -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_REGULAR_EXPRESSIONS #include "regeximp.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/utf16.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/regeximp.h b/icuSources/i18n/regeximp.h index bb0e1e8..46061dc 100644 --- a/icuSources/i18n/regeximp.h +++ b/icuSources/i18n/regeximp.h @@ -14,10 +14,10 @@ #ifndef _REGEXIMP_H #define _REGEXIMP_H -#include "unicode/utypes.h" -#include "unicode/uobject.h" -#include "unicode/uniset.h" -#include "unicode/utext.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/uobject.h> +#include <_foundation_unicode/uniset.h> +#include <_foundation_unicode/utext.h> #include "cmemory.h" #include "ucase.h" diff --git a/icuSources/i18n/regexst.cpp b/icuSources/i18n/regexst.cpp index dc01327..8aa9408 100644 --- a/icuSources/i18n/regexst.cpp +++ b/icuSources/i18n/regexst.cpp @@ -9,21 +9,21 @@ // This file contains class RegexStaticSets // // This class is internal to the regular expression implementation. -// For the public Regular Expression API, see the file "unicode/regex.h" +// For the public Regular Expression API, see the file "_foundation_unicode/regex.h" // // RegexStaticSets groups together the common UnicodeSets that are needed // for compiling or executing RegularExpressions. This grouping simplifies // the thread safe lazy creation and sharing of these sets across // all instances of regular expressions. // -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_REGULAR_EXPRESSIONS -#include "unicode/unistr.h" -#include "unicode/uniset.h" -#include "unicode/uchar.h" -#include "unicode/regex.h" +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/uniset.h> +#include <_foundation_unicode/uchar.h> +#include <_foundation_unicode/regex.h> #include "uprops.h" #include "cmemory.h" #include "cstring.h" diff --git a/icuSources/i18n/regexst.h b/icuSources/i18n/regexst.h index bcb393d..bd79fa0 100644 --- a/icuSources/i18n/regexst.h +++ b/icuSources/i18n/regexst.h @@ -9,7 +9,7 @@ // This file contains declarations for the class RegexStaticSets // // This class is internal to the regular expression implementation. -// For the public Regular Expression API, see the file "unicode/regex.h" +// For the public Regular Expression API, see the file "_foundation_unicode/regex.h" // // RegexStaticSets groups together the common UnicodeSets that are needed // for compiling or executing RegularExpressions. This grouping simplifies @@ -20,8 +20,8 @@ #ifndef REGEXST_H #define REGEXST_H -#include "unicode/utypes.h" -#include "unicode/utext.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/utext.h> #if !UCONFIG_NO_REGULAR_EXPRESSIONS #include "regeximp.h" diff --git a/icuSources/i18n/regextxt.cpp b/icuSources/i18n/regextxt.cpp index 41bb4a9..e3df23c 100644 --- a/icuSources/i18n/regextxt.cpp +++ b/icuSources/i18n/regextxt.cpp @@ -11,7 +11,7 @@ // This file contains utility code for supporting UText in the regular expression engine. // -#include "unicode/utf.h" +#include <_foundation_unicode/utf.h> #include "regextxt.h" U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/regextxt.h b/icuSources/i18n/regextxt.h index 0f64b84..dc81e20 100644 --- a/icuSources/i18n/regextxt.h +++ b/icuSources/i18n/regextxt.h @@ -11,14 +11,14 @@ // This file contains utility code for supporting UText in the regular expression engine. // // This class is internal to the regular expression implementation. -// For the public Regular Expression API, see the file "unicode/regex.h" +// For the public Regular Expression API, see the file "_foundation_unicode/regex.h" // #ifndef _REGEXTXT_H #define _REGEXTXT_H -#include "unicode/utypes.h" -#include "unicode/utext.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/utext.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/region.cpp b/icuSources/i18n/region.cpp index 6a0c05f..1788e52 100644 --- a/icuSources/i18n/region.cpp +++ b/icuSources/i18n/region.cpp @@ -20,11 +20,11 @@ * \brief C++ API: Region classes (territory containment) */ -#include "unicode/region.h" -#include "unicode/utypes.h" -#include "unicode/uobject.h" -#include "unicode/unistr.h" -#include "unicode/ures.h" +#include <_foundation_unicode/region.h> +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/uobject.h> +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/ures.h> #include "ucln_in.h" #include "cstring.h" #include "mutex.h" diff --git a/icuSources/i18n/region_impl.h b/icuSources/i18n/region_impl.h index b6a2813..c47cedf 100644 --- a/icuSources/i18n/region_impl.h +++ b/icuSources/i18n/region_impl.h @@ -14,12 +14,12 @@ #ifndef __REGION_IMPL_H__ #define __REGION_IMPL_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #include "uvector.h" -#include "unicode/strenum.h" +#include <_foundation_unicode/strenum.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/reldatefmt.cpp b/icuSources/i18n/reldatefmt.cpp index 66e9f54..439f465 100644 --- a/icuSources/i18n/reldatefmt.cpp +++ b/icuSources/i18n/reldatefmt.cpp @@ -10,28 +10,28 @@ ****************************************************************************** */ -#include "unicode/reldatefmt.h" +#include <_foundation_unicode/reldatefmt.h> #if !UCONFIG_NO_FORMATTING && !UCONFIG_NO_BREAK_ITERATION #include #include -#include "unicode/calendar.h" -#include "unicode/datefmt.h" -#include "unicode/dtfmtsym.h" -#include "unicode/ucasemap.h" -#include "unicode/ureldatefmt.h" -#include "unicode/udisplaycontext.h" -#include "unicode/unum.h" -#include "unicode/localpointer.h" -#include "unicode/plurrule.h" -#include "unicode/simpleformatter.h" -#include "unicode/decimfmt.h" -#include "unicode/numfmt.h" -#include "unicode/brkiter.h" -#include "unicode/simpleformatter.h" +#include <_foundation_unicode/calendar.h> +#include <_foundation_unicode/datefmt.h> +#include <_foundation_unicode/dtfmtsym.h> +#include <_foundation_unicode/ucasemap.h> +#include <_foundation_unicode/ureldatefmt.h> +#include <_foundation_unicode/udisplaycontext.h> +#include <_foundation_unicode/unum.h> +#include <_foundation_unicode/localpointer.h> +#include <_foundation_unicode/plurrule.h> +#include <_foundation_unicode/simpleformatter.h> +#include <_foundation_unicode/decimfmt.h> +#include <_foundation_unicode/numfmt.h> +#include <_foundation_unicode/brkiter.h> +#include <_foundation_unicode/simpleformatter.h> #include "uresimp.h" -#include "unicode/ures.h" +#include <_foundation_unicode/ures.h> #include "cstring.h" #include "ucln_in.h" #include "mutex.h" diff --git a/icuSources/i18n/reldtfmt.cpp b/icuSources/i18n/reldtfmt.cpp index f381bf8..5ba32d5 100644 --- a/icuSources/i18n/reldtfmt.cpp +++ b/icuSources/i18n/reldtfmt.cpp @@ -7,20 +7,20 @@ ******************************************************************************* */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #include -#include "unicode/datefmt.h" -#include "unicode/reldatefmt.h" -#include "unicode/simpleformatter.h" -#include "unicode/smpdtfmt.h" -#include "unicode/udisplaycontext.h" -#include "unicode/uchar.h" -#include "unicode/brkiter.h" -#include "unicode/ucasemap.h" +#include <_foundation_unicode/datefmt.h> +#include <_foundation_unicode/reldatefmt.h> +#include <_foundation_unicode/simpleformatter.h> +#include <_foundation_unicode/smpdtfmt.h> +#include <_foundation_unicode/udisplaycontext.h> +#include <_foundation_unicode/uchar.h> +#include <_foundation_unicode/brkiter.h> +#include <_foundation_unicode/ucasemap.h> #include "reldtfmt.h" #include "cmemory.h" #include "uresimp.h" diff --git a/icuSources/i18n/reldtfmt.h b/icuSources/i18n/reldtfmt.h index 0ca4a74..0a758e0 100644 --- a/icuSources/i18n/reldtfmt.h +++ b/icuSources/i18n/reldtfmt.h @@ -10,7 +10,7 @@ #ifndef RELDTFMT_H #define RELDTFMT_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> /** * \file @@ -19,9 +19,9 @@ #if !UCONFIG_NO_FORMATTING -#include "unicode/datefmt.h" -#include "unicode/smpdtfmt.h" -#include "unicode/brkiter.h" +#include <_foundation_unicode/datefmt.h> +#include <_foundation_unicode/smpdtfmt.h> +#include <_foundation_unicode/brkiter.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/rematch.cpp b/icuSources/i18n/rematch.cpp index 8fe8ac7..8ecec68 100644 --- a/icuSources/i18n/rematch.cpp +++ b/icuSources/i18n/rematch.cpp @@ -13,21 +13,21 @@ // which is one of the main API classes for the ICU regular expression package. // -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if APPLE_ICU_CHANGES && U_PLATFORM_IS_DARWIN_BASED -// Logging for rdar://79977677; include must be after unicode/utypes.h +// Logging for rdar://79977677; include must be after _foundation_unicode/utypes.h #include #endif // APPLE_ICU_CHANGES && U_PLATFORM_IS_DARWIN_BASED #if !UCONFIG_NO_REGULAR_EXPRESSIONS -#include "unicode/regex.h" -#include "unicode/uniset.h" -#include "unicode/uchar.h" -#include "unicode/ustring.h" -#include "unicode/rbbi.h" -#include "unicode/utf.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/regex.h> +#include <_foundation_unicode/uniset.h> +#include <_foundation_unicode/uchar.h> +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/rbbi.h> +#include <_foundation_unicode/utf.h> +#include <_foundation_unicode/utf16.h> #include "uassert.h" #include "cmemory.h" #include "cstr.h" diff --git a/icuSources/i18n/remtrans.cpp b/icuSources/i18n/remtrans.cpp index 957ac48..945d5ab 100644 --- a/icuSources/i18n/remtrans.cpp +++ b/icuSources/i18n/remtrans.cpp @@ -10,12 +10,12 @@ ********************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_TRANSLITERATION #include "remtrans.h" -#include "unicode/unifilt.h" +#include <_foundation_unicode/unifilt.h> static const UChar CURR_ID[] = {65, 110, 121, 45, 0x52, 0x65, 0x6D, 0x6F, 0x76, 0x65, 0x00}; /* "Any-Remove" */ diff --git a/icuSources/i18n/remtrans.h b/icuSources/i18n/remtrans.h index 398cc51..cadaf9e 100644 --- a/icuSources/i18n/remtrans.h +++ b/icuSources/i18n/remtrans.h @@ -12,11 +12,11 @@ #ifndef REMTRANS_H #define REMTRANS_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_TRANSLITERATION -#include "unicode/translit.h" +#include <_foundation_unicode/translit.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/repattrn.cpp b/icuSources/i18n/repattrn.cpp index 0ef85bd..620d9c7 100644 --- a/icuSources/i18n/repattrn.cpp +++ b/icuSources/i18n/repattrn.cpp @@ -10,12 +10,12 @@ *************************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_REGULAR_EXPRESSIONS -#include "unicode/regex.h" -#include "unicode/uclean.h" +#include <_foundation_unicode/regex.h> +#include <_foundation_unicode/uclean.h> #include "cmemory.h" #include "cstr.h" #include "uassert.h" diff --git a/icuSources/i18n/rulebasedcollator.cpp b/icuSources/i18n/rulebasedcollator.cpp index fb8fc37..ddaad2f 100644 --- a/icuSources/i18n/rulebasedcollator.cpp +++ b/icuSources/i18n/rulebasedcollator.cpp @@ -13,24 +13,24 @@ * created by: Markus W. Scherer */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_COLLATION -#include "unicode/coll.h" -#include "unicode/coleitr.h" -#include "unicode/localpointer.h" -#include "unicode/locid.h" -#include "unicode/sortkey.h" -#include "unicode/tblcoll.h" -#include "unicode/ucol.h" -#include "unicode/uiter.h" -#include "unicode/uloc.h" -#include "unicode/uniset.h" -#include "unicode/unistr.h" -#include "unicode/usetiter.h" -#include "unicode/utf8.h" -#include "unicode/uversion.h" +#include <_foundation_unicode/coll.h> +#include <_foundation_unicode/coleitr.h> +#include <_foundation_unicode/localpointer.h> +#include <_foundation_unicode/locid.h> +#include <_foundation_unicode/sortkey.h> +#include <_foundation_unicode/tblcoll.h> +#include <_foundation_unicode/ucol.h> +#include <_foundation_unicode/uiter.h> +#include <_foundation_unicode/uloc.h> +#include <_foundation_unicode/uniset.h> +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/usetiter.h> +#include <_foundation_unicode/utf8.h> +#include <_foundation_unicode/uversion.h> #include "bocsu.h" #include "charstr.h" #include "cmemory.h" diff --git a/icuSources/i18n/scientificnumberformatter.cpp b/icuSources/i18n/scientificnumberformatter.cpp index 99b9907..eefb0ce 100644 --- a/icuSources/i18n/scientificnumberformatter.cpp +++ b/icuSources/i18n/scientificnumberformatter.cpp @@ -6,16 +6,16 @@ * Corporation and others. All Rights Reserved. ********************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/scientificnumberformatter.h" -#include "unicode/dcfmtsym.h" -#include "unicode/fpositer.h" -#include "unicode/utf16.h" -#include "unicode/uniset.h" -#include "unicode/decimfmt.h" +#include <_foundation_unicode/scientificnumberformatter.h> +#include <_foundation_unicode/dcfmtsym.h> +#include <_foundation_unicode/fpositer.h> +#include <_foundation_unicode/utf16.h> +#include <_foundation_unicode/uniset.h> +#include <_foundation_unicode/decimfmt.h> #include "static_unicode_sets.h" U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/scriptset.cpp b/icuSources/i18n/scriptset.cpp index 236bf9d..259a9d8 100644 --- a/icuSources/i18n/scriptset.cpp +++ b/icuSources/i18n/scriptset.cpp @@ -12,10 +12,10 @@ * created by: Andy Heninger */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> -#include "unicode/uchar.h" -#include "unicode/unistr.h" +#include <_foundation_unicode/uchar.h> +#include <_foundation_unicode/unistr.h> #include "scriptset.h" #include "uassert.h" diff --git a/icuSources/i18n/scriptset.h b/icuSources/i18n/scriptset.h index 2575981..efaced2 100644 --- a/icuSources/i18n/scriptset.h +++ b/icuSources/i18n/scriptset.h @@ -15,9 +15,9 @@ #ifndef __SCRIPTSET_H__ #define __SCRIPTSET_H__ -#include "unicode/utypes.h" -#include "unicode/uobject.h" -#include "unicode/uscript.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/uobject.h> +#include <_foundation_unicode/uscript.h> #include "uelement.h" diff --git a/icuSources/i18n/search.cpp b/icuSources/i18n/search.cpp index 56d9b74..41d51c1 100644 --- a/icuSources/i18n/search.cpp +++ b/icuSources/i18n/search.cpp @@ -9,13 +9,13 @@ ********************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_COLLATION && !UCONFIG_NO_BREAK_ITERATION -#include "unicode/brkiter.h" -#include "unicode/schriter.h" -#include "unicode/search.h" +#include <_foundation_unicode/brkiter.h> +#include <_foundation_unicode/schriter.h> +#include <_foundation_unicode/search.h> #include "usrchimp.h" #include "cmemory.h" diff --git a/icuSources/i18n/selfmt.cpp b/icuSources/i18n/selfmt.cpp index 9928d28..dd17060 100644 --- a/icuSources/i18n/selfmt.cpp +++ b/icuSources/i18n/selfmt.cpp @@ -18,14 +18,14 @@ #include "utypeinfo.h" // for 'typeid' to work -#include "unicode/messagepattern.h" -#include "unicode/rbnf.h" -#include "unicode/selfmt.h" -#include "unicode/uchar.h" -#include "unicode/ucnv_err.h" -#include "unicode/umsg.h" -#include "unicode/ustring.h" -#include "unicode/utypes.h" +#include <_foundation_unicode/messagepattern.h> +#include <_foundation_unicode/rbnf.h> +#include <_foundation_unicode/selfmt.h> +#include <_foundation_unicode/uchar.h> +#include <_foundation_unicode/ucnv_err.h> +#include <_foundation_unicode/umsg.h> +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/utypes.h> #include "cmemory.h" #include "messageimpl.h" #include "patternprops.h" diff --git a/icuSources/i18n/selfmtimpl.h b/icuSources/i18n/selfmtimpl.h index a36d1a5..60c7f2a 100644 --- a/icuSources/i18n/selfmtimpl.h +++ b/icuSources/i18n/selfmtimpl.h @@ -18,10 +18,10 @@ #if !UCONFIG_NO_FORMATTING -#include "unicode/format.h" -#include "unicode/locid.h" -#include "unicode/parseerr.h" -#include "unicode/utypes.h" +#include <_foundation_unicode/format.h> +#include <_foundation_unicode/locid.h> +#include <_foundation_unicode/parseerr.h> +#include <_foundation_unicode/utypes.h> #include "uvector.h" #include "hash.h" diff --git a/icuSources/i18n/sharedbreakiterator.cpp b/icuSources/i18n/sharedbreakiterator.cpp index 82f482b..344f781 100644 --- a/icuSources/i18n/sharedbreakiterator.cpp +++ b/icuSources/i18n/sharedbreakiterator.cpp @@ -11,7 +11,7 @@ ******************************************************************************* */ #include "sharedbreakiterator.h" -#include "unicode/brkiter.h" +#include <_foundation_unicode/brkiter.h> #if !UCONFIG_NO_BREAK_ITERATION diff --git a/icuSources/i18n/sharedbreakiterator.h b/icuSources/i18n/sharedbreakiterator.h index 76e959f..a18ce90 100644 --- a/icuSources/i18n/sharedbreakiterator.h +++ b/icuSources/i18n/sharedbreakiterator.h @@ -11,7 +11,7 @@ #ifndef __SHARED_BREAKITERATOR_H__ #define __SHARED_BREAKITERATOR_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #include "sharedobject.h" #if !UCONFIG_NO_BREAK_ITERATION diff --git a/icuSources/i18n/sharedcalendar.h b/icuSources/i18n/sharedcalendar.h index 60d1d5d..2071e69 100644 --- a/icuSources/i18n/sharedcalendar.h +++ b/icuSources/i18n/sharedcalendar.h @@ -11,7 +11,7 @@ #ifndef __SHARED_CALENDAR_H__ #define __SHARED_CALENDAR_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #include "sharedobject.h" #include "unifiedcache.h" diff --git a/icuSources/i18n/shareddateformatsymbols.h b/icuSources/i18n/shareddateformatsymbols.h index b51fad9..90baf8b 100644 --- a/icuSources/i18n/shareddateformatsymbols.h +++ b/icuSources/i18n/shareddateformatsymbols.h @@ -11,12 +11,12 @@ #ifndef __SHARED_DATEFORMATSYMBOLS_H__ #define __SHARED_DATEFORMATSYMBOLS_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #include "sharedobject.h" -#include "unicode/dtfmtsym.h" +#include <_foundation_unicode/dtfmtsym.h> #include "unifiedcache.h" U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/sharednumberformat.h b/icuSources/i18n/sharednumberformat.h index bd914c0..7c97d65 100644 --- a/icuSources/i18n/sharednumberformat.h +++ b/icuSources/i18n/sharednumberformat.h @@ -11,7 +11,7 @@ #ifndef __SHARED_NUMBERFORMAT_H__ #define __SHARED_NUMBERFORMAT_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #include "sharedobject.h" #include "unifiedcache.h" diff --git a/icuSources/i18n/sharedpluralrules.h b/icuSources/i18n/sharedpluralrules.h index 11c82c5..caeace1 100644 --- a/icuSources/i18n/sharedpluralrules.h +++ b/icuSources/i18n/sharedpluralrules.h @@ -11,7 +11,7 @@ #ifndef __SHARED_PLURALRULES_H__ #define __SHARED_PLURALRULES_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #include "sharedobject.h" #include "unifiedcache.h" diff --git a/icuSources/i18n/simpletz.cpp b/icuSources/i18n/simpletz.cpp index 77403e4..f59f4cd 100644 --- a/icuSources/i18n/simpletz.cpp +++ b/icuSources/i18n/simpletz.cpp @@ -25,13 +25,13 @@ #include "utypeinfo.h" // for 'typeid' to work -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/simpletz.h" -#include "unicode/gregocal.h" -#include "unicode/smpdtfmt.h" +#include <_foundation_unicode/simpletz.h> +#include <_foundation_unicode/gregocal.h> +#include <_foundation_unicode/smpdtfmt.h> #include "cmemory.h" #include "gregoimp.h" diff --git a/icuSources/i18n/smpdtfmt.cpp b/icuSources/i18n/smpdtfmt.cpp index f2ad0cc..467a2c5 100644 --- a/icuSources/i18n/smpdtfmt.cpp +++ b/icuSources/i18n/smpdtfmt.cpp @@ -28,33 +28,33 @@ #define ZID_KEY_MAX 128 -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/smpdtfmt.h" -#include "unicode/dtfmtsym.h" -#include "unicode/ures.h" -#include "unicode/msgfmt.h" -#include "unicode/calendar.h" -#include "unicode/gregocal.h" -#include "unicode/timezone.h" -#include "unicode/decimfmt.h" -#include "unicode/dcfmtsym.h" -#include "unicode/uchar.h" -#include "unicode/uniset.h" -#include "unicode/ustring.h" -#include "unicode/basictz.h" -#include "unicode/simpleformatter.h" -#include "unicode/simpletz.h" -#include "unicode/rbtz.h" -#include "unicode/tzfmt.h" -#include "unicode/ucasemap.h" -#include "unicode/utf16.h" -#include "unicode/vtzone.h" -#include "unicode/udisplaycontext.h" -#include "unicode/brkiter.h" -#include "unicode/rbnf.h" -#include "unicode/dtptngen.h" +#include <_foundation_unicode/smpdtfmt.h> +#include <_foundation_unicode/dtfmtsym.h> +#include <_foundation_unicode/ures.h> +#include <_foundation_unicode/msgfmt.h> +#include <_foundation_unicode/calendar.h> +#include <_foundation_unicode/gregocal.h> +#include <_foundation_unicode/timezone.h> +#include <_foundation_unicode/decimfmt.h> +#include <_foundation_unicode/dcfmtsym.h> +#include <_foundation_unicode/uchar.h> +#include <_foundation_unicode/uniset.h> +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/basictz.h> +#include <_foundation_unicode/simpleformatter.h> +#include <_foundation_unicode/simpletz.h> +#include <_foundation_unicode/rbtz.h> +#include <_foundation_unicode/tzfmt.h> +#include <_foundation_unicode/ucasemap.h> +#include <_foundation_unicode/utf16.h> +#include <_foundation_unicode/vtzone.h> +#include <_foundation_unicode/udisplaycontext.h> +#include <_foundation_unicode/brkiter.h> +#include <_foundation_unicode/rbnf.h> +#include <_foundation_unicode/dtptngen.h> #include "uresimp.h" #include "olsontz.h" #include "patternprops.h" diff --git a/icuSources/i18n/smpdtfst.cpp b/icuSources/i18n/smpdtfst.cpp index bbf6e9e..e118f35 100644 --- a/icuSources/i18n/smpdtfst.cpp +++ b/icuSources/i18n/smpdtfst.cpp @@ -13,12 +13,12 @@ ******************************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/uniset.h" -#include "unicode/udat.h" +#include <_foundation_unicode/uniset.h> +#include <_foundation_unicode/udat.h> #include "cmemory.h" #include "uassert.h" #include "ucln_in.h" diff --git a/icuSources/i18n/smpdtfst.h b/icuSources/i18n/smpdtfst.h index cc80909..02c77be 100644 --- a/icuSources/i18n/smpdtfst.h +++ b/icuSources/i18n/smpdtfst.h @@ -16,12 +16,12 @@ #ifndef SMPDTFST_H #define SMPDTFST_H -#include "unicode/uobject.h" -#include "unicode/utypes.h" +#include <_foundation_unicode/uobject.h> +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/udat.h" +#include <_foundation_unicode/udat.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/sortkey.cpp b/icuSources/i18n/sortkey.cpp index 441d15d..dea086b 100644 --- a/icuSources/i18n/sortkey.cpp +++ b/icuSources/i18n/sortkey.cpp @@ -29,11 +29,11 @@ // than the other //=============================================================================== -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_COLLATION -#include "unicode/sortkey.h" +#include <_foundation_unicode/sortkey.h> #include "cmemory.h" #include "uelement.h" #include "ustr_imp.h" diff --git a/icuSources/i18n/standardplural.cpp b/icuSources/i18n/standardplural.cpp index 5a6069b..0b89138 100644 --- a/icuSources/i18n/standardplural.cpp +++ b/icuSources/i18n/standardplural.cpp @@ -11,11 +11,11 @@ * created by: Markus W. Scherer */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/unistr.h" +#include <_foundation_unicode/unistr.h> #include "cstring.h" #include "standardplural.h" #include "uassert.h" diff --git a/icuSources/i18n/standardplural.h b/icuSources/i18n/standardplural.h index 1659306..5a01ad6 100644 --- a/icuSources/i18n/standardplural.h +++ b/icuSources/i18n/standardplural.h @@ -14,7 +14,7 @@ #ifndef __STANDARDPLURAL_H__ #define __STANDARDPLURAL_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING diff --git a/icuSources/i18n/string_segment.cpp b/icuSources/i18n/string_segment.cpp index 2ddb738..6a39c9e 100644 --- a/icuSources/i18n/string_segment.cpp +++ b/icuSources/i18n/string_segment.cpp @@ -1,7 +1,7 @@ // © 2018 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING @@ -12,8 +12,8 @@ #include "numparse_types.h" #include "string_segment.h" #include "putilimp.h" -#include "unicode/utf16.h" -#include "unicode/uniset.h" +#include <_foundation_unicode/utf16.h> +#include <_foundation_unicode/uniset.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/string_segment.h b/icuSources/i18n/string_segment.h index b581f7e..bd05abd 100644 --- a/icuSources/i18n/string_segment.h +++ b/icuSources/i18n/string_segment.h @@ -1,14 +1,14 @@ // © 2018 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #ifndef __NUMPARSE_STRINGSEGMENT_H__ #define __NUMPARSE_STRINGSEGMENT_H__ -#include "unicode/unistr.h" -#include "unicode/uniset.h" +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/uniset.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/strmatch.cpp b/icuSources/i18n/strmatch.cpp index 93febc7..bcb6a60 100644 --- a/icuSources/i18n/strmatch.cpp +++ b/icuSources/i18n/strmatch.cpp @@ -10,15 +10,15 @@ ********************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_TRANSLITERATION #include "strmatch.h" #include "rbt_data.h" #include "util.h" -#include "unicode/uniset.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/uniset.h> +#include <_foundation_unicode/utf16.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/strmatch.h b/icuSources/i18n/strmatch.h index 6d2e392..06ed225 100644 --- a/icuSources/i18n/strmatch.h +++ b/icuSources/i18n/strmatch.h @@ -11,14 +11,14 @@ #ifndef STRMATCH_H #define STRMATCH_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_TRANSLITERATION -#include "unicode/unistr.h" -#include "unicode/unifunct.h" -#include "unicode/unimatch.h" -#include "unicode/unirepl.h" +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/unifunct.h> +#include <_foundation_unicode/unimatch.h> +#include <_foundation_unicode/unirepl.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/strrepl.cpp b/icuSources/i18n/strrepl.cpp index 23dab55..7fcc7f7 100644 --- a/icuSources/i18n/strrepl.cpp +++ b/icuSources/i18n/strrepl.cpp @@ -10,12 +10,12 @@ ********************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_TRANSLITERATION -#include "unicode/uniset.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/uniset.h> +#include <_foundation_unicode/utf16.h> #include "strrepl.h" #include "rbt_data.h" #include "util.h" diff --git a/icuSources/i18n/strrepl.h b/icuSources/i18n/strrepl.h index 8063626..7f5b2fd 100644 --- a/icuSources/i18n/strrepl.h +++ b/icuSources/i18n/strrepl.h @@ -13,13 +13,13 @@ #ifndef STRREPL_H #define STRREPL_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_TRANSLITERATION -#include "unicode/unifunct.h" -#include "unicode/unirepl.h" -#include "unicode/unistr.h" +#include <_foundation_unicode/unifunct.h> +#include <_foundation_unicode/unirepl.h> +#include <_foundation_unicode/unistr.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/stsearch.cpp b/icuSources/i18n/stsearch.cpp index 1bade8f..42575db 100644 --- a/icuSources/i18n/stsearch.cpp +++ b/icuSources/i18n/stsearch.cpp @@ -9,11 +9,11 @@ ********************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_COLLATION && !UCONFIG_NO_BREAK_ITERATION -#include "unicode/stsearch.h" +#include <_foundation_unicode/stsearch.h> #include "usrchimp.h" #include "cmemory.h" diff --git a/icuSources/i18n/taiwncal.cpp b/icuSources/i18n/taiwncal.cpp index 48f0b99..d2baab3 100644 --- a/icuSources/i18n/taiwncal.cpp +++ b/icuSources/i18n/taiwncal.cpp @@ -15,12 +15,12 @@ * */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #include "taiwncal.h" -#include "unicode/gregocal.h" +#include <_foundation_unicode/gregocal.h> #include "umutex.h" #include diff --git a/icuSources/i18n/taiwncal.h b/icuSources/i18n/taiwncal.h index ab6b6af..5ec197f 100644 --- a/icuSources/i18n/taiwncal.h +++ b/icuSources/i18n/taiwncal.h @@ -19,12 +19,12 @@ #ifndef TAIWNCAL_H #define TAIWNCAL_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/calendar.h" -#include "unicode/gregocal.h" +#include <_foundation_unicode/calendar.h> +#include <_foundation_unicode/gregocal.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/timezone.cpp b/icuSources/i18n/timezone.cpp index 00b44bf..3563f0b 100644 --- a/icuSources/i18n/timezone.cpp +++ b/icuSources/i18n/timezone.cpp @@ -39,8 +39,8 @@ #include "utypeinfo.h" // for 'typeid' to work -#include "unicode/utypes.h" -#include "unicode/ustring.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/ustring.h> #include "uassert.h" #include "ustr_imp.h" @@ -70,21 +70,21 @@ static char gStrBuf[256]; #if !UCONFIG_NO_FORMATTING -#include "unicode/simpletz.h" -#include "unicode/calendar.h" -#include "unicode/gregocal.h" -#include "unicode/ures.h" -#include "unicode/tzfmt.h" -#include "unicode/numfmt.h" +#include <_foundation_unicode/simpletz.h> +#include <_foundation_unicode/calendar.h> +#include <_foundation_unicode/gregocal.h> +#include <_foundation_unicode/ures.h> +#include <_foundation_unicode/tzfmt.h> +#include <_foundation_unicode/numfmt.h> #include "gregoimp.h" #include "uresimp.h" // struct UResourceBundle #include "olsontz.h" #include "mutex.h" -#include "unicode/udata.h" +#include <_foundation_unicode/udata.h> #include "ucln_in.h" #include "cstring.h" #include "cmemory.h" -#include "unicode/strenum.h" +#include <_foundation_unicode/strenum.h> #include "uassert.h" #include "zonemeta.h" diff --git a/icuSources/i18n/titletrn.cpp b/icuSources/i18n/titletrn.cpp index 62e41f9..d57ba7f 100644 --- a/icuSources/i18n/titletrn.cpp +++ b/icuSources/i18n/titletrn.cpp @@ -10,14 +10,14 @@ ********************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_TRANSLITERATION -#include "unicode/uchar.h" -#include "unicode/uniset.h" -#include "unicode/ustring.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/uchar.h> +#include <_foundation_unicode/uniset.h> +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/utf16.h> #include "titletrn.h" #include "umutex.h" #include "ucase.h" diff --git a/icuSources/i18n/titletrn.h b/icuSources/i18n/titletrn.h index 8409519..3a8a15b 100644 --- a/icuSources/i18n/titletrn.h +++ b/icuSources/i18n/titletrn.h @@ -12,11 +12,11 @@ #ifndef TITLETRN_H #define TITLETRN_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_TRANSLITERATION -#include "unicode/translit.h" +#include <_foundation_unicode/translit.h> #include "ucase.h" #include "casetrn.h" diff --git a/icuSources/i18n/tmunit.cpp b/icuSources/i18n/tmunit.cpp index 361aecb..f3f805f 100644 --- a/icuSources/i18n/tmunit.cpp +++ b/icuSources/i18n/tmunit.cpp @@ -7,7 +7,7 @@ ******************************************************************************* */ -#include "unicode/tmunit.h" +#include <_foundation_unicode/tmunit.h> #include "uassert.h" #if !UCONFIG_NO_FORMATTING diff --git a/icuSources/i18n/tmutamt.cpp b/icuSources/i18n/tmutamt.cpp index 2753c29..56aab9e 100644 --- a/icuSources/i18n/tmutamt.cpp +++ b/icuSources/i18n/tmutamt.cpp @@ -7,7 +7,7 @@ ******************************************************************************* */ -#include "unicode/tmutamt.h" +#include <_foundation_unicode/tmutamt.h> #if !UCONFIG_NO_FORMATTING diff --git a/icuSources/i18n/tmutfmt.cpp b/icuSources/i18n/tmutfmt.cpp index 37e56b2..2280046 100644 --- a/icuSources/i18n/tmutfmt.cpp +++ b/icuSources/i18n/tmutfmt.cpp @@ -7,12 +7,12 @@ ******************************************************************************* */ -#include "unicode/tmutfmt.h" +#include <_foundation_unicode/tmutfmt.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/decimfmt.h" -#include "unicode/localpointer.h" +#include <_foundation_unicode/decimfmt.h> +#include <_foundation_unicode/localpointer.h> #include "plurrule_impl.h" #include "uvector.h" #include "charstr.h" @@ -21,7 +21,7 @@ #include "hash.h" #include "uresimp.h" #include "ureslocs.h" -#include "unicode/msgfmt.h" +#include <_foundation_unicode/msgfmt.h> #include "uassert.h" #define LEFT_CURLY_BRACKET ((UChar)0x007B) diff --git a/icuSources/i18n/tolowtrn.cpp b/icuSources/i18n/tolowtrn.cpp index 2893278..4499f67 100644 --- a/icuSources/i18n/tolowtrn.cpp +++ b/icuSources/i18n/tolowtrn.cpp @@ -10,12 +10,12 @@ ********************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_TRANSLITERATION -#include "unicode/uchar.h" -#include "unicode/ustring.h" +#include <_foundation_unicode/uchar.h> +#include <_foundation_unicode/ustring.h> #include "tolowtrn.h" #include "ustr_imp.h" #include "cpputils.h" diff --git a/icuSources/i18n/tolowtrn.h b/icuSources/i18n/tolowtrn.h index 951128e..c05b833 100644 --- a/icuSources/i18n/tolowtrn.h +++ b/icuSources/i18n/tolowtrn.h @@ -12,11 +12,11 @@ #ifndef TOLOWTRN_H #define TOLOWTRN_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_TRANSLITERATION -#include "unicode/translit.h" +#include <_foundation_unicode/translit.h> #include "casetrn.h" U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/toupptrn.cpp b/icuSources/i18n/toupptrn.cpp index 2a8b78b..7d39b84 100644 --- a/icuSources/i18n/toupptrn.cpp +++ b/icuSources/i18n/toupptrn.cpp @@ -10,12 +10,12 @@ ********************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_TRANSLITERATION -#include "unicode/ustring.h" -#include "unicode/uchar.h" +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/uchar.h> #include "toupptrn.h" #include "ustr_imp.h" #include "cpputils.h" diff --git a/icuSources/i18n/toupptrn.h b/icuSources/i18n/toupptrn.h index 755e9ed..5b2592f 100644 --- a/icuSources/i18n/toupptrn.h +++ b/icuSources/i18n/toupptrn.h @@ -12,11 +12,11 @@ #ifndef TOUPPTRN_H #define TOUPPTRN_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_TRANSLITERATION -#include "unicode/translit.h" +#include <_foundation_unicode/translit.h> #include "casetrn.h" U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/translit.cpp b/icuSources/i18n/translit.cpp index b085593..8d5c43e 100644 --- a/icuSources/i18n/translit.cpp +++ b/icuSources/i18n/translit.cpp @@ -12,21 +12,21 @@ #include "utypeinfo.h" // for 'typeid' to work -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_TRANSLITERATION -#include "unicode/putil.h" -#include "unicode/translit.h" -#include "unicode/locid.h" -#include "unicode/msgfmt.h" -#include "unicode/rep.h" -#include "unicode/resbund.h" -#include "unicode/unifilt.h" -#include "unicode/uniset.h" -#include "unicode/uscript.h" -#include "unicode/strenum.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/putil.h> +#include <_foundation_unicode/translit.h> +#include <_foundation_unicode/locid.h> +#include <_foundation_unicode/msgfmt.h> +#include <_foundation_unicode/rep.h> +#include <_foundation_unicode/resbund.h> +#include <_foundation_unicode/unifilt.h> +#include <_foundation_unicode/uniset.h> +#include <_foundation_unicode/uscript.h> +#include <_foundation_unicode/strenum.h> +#include <_foundation_unicode/utf16.h> #include "cpdtrans.h" #include "nultrans.h" #include "rbt_data.h" diff --git a/icuSources/i18n/transreg.cpp b/icuSources/i18n/transreg.cpp index 4c6ee24..126ad43 100644 --- a/icuSources/i18n/transreg.cpp +++ b/icuSources/i18n/transreg.cpp @@ -10,14 +10,14 @@ ********************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_TRANSLITERATION -#include "unicode/translit.h" -#include "unicode/resbund.h" -#include "unicode/uniset.h" -#include "unicode/uscript.h" +#include <_foundation_unicode/translit.h> +#include <_foundation_unicode/resbund.h> +#include <_foundation_unicode/uniset.h> +#include <_foundation_unicode/uscript.h> #include "rbt.h" #include "cpdtrans.h" #include "nultrans.h" diff --git a/icuSources/i18n/transreg.h b/icuSources/i18n/transreg.h index 686e62a..46c5a95 100644 --- a/icuSources/i18n/transreg.h +++ b/icuSources/i18n/transreg.h @@ -12,12 +12,12 @@ #ifndef _TRANSREG_H #define _TRANSREG_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_TRANSLITERATION -#include "unicode/uobject.h" -#include "unicode/translit.h" +#include <_foundation_unicode/uobject.h> +#include <_foundation_unicode/translit.h> #include "hash.h" #include "uvector.h" diff --git a/icuSources/i18n/tridpars.cpp b/icuSources/i18n/tridpars.cpp index a52f928..eb3831a 100644 --- a/icuSources/i18n/tridpars.cpp +++ b/icuSources/i18n/tridpars.cpp @@ -10,7 +10,7 @@ ********************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_TRANSLITERATION @@ -20,12 +20,12 @@ #include "transreg.h" #include "uassert.h" #include "ucln_in.h" -#include "unicode/parsepos.h" -#include "unicode/translit.h" -#include "unicode/uchar.h" -#include "unicode/uniset.h" -#include "unicode/unistr.h" -#include "unicode/utrans.h" +#include <_foundation_unicode/parsepos.h> +#include <_foundation_unicode/translit.h> +#include <_foundation_unicode/uchar.h> +#include <_foundation_unicode/uniset.h> +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/utrans.h> #include "util.h" #include "uvector.h" diff --git a/icuSources/i18n/tridpars.h b/icuSources/i18n/tridpars.h index 03d68cc..49fa40b 100644 --- a/icuSources/i18n/tridpars.h +++ b/icuSources/i18n/tridpars.h @@ -12,12 +12,12 @@ #ifndef TRIDPARS_H #define TRIDPARS_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_TRANSLITERATION -#include "unicode/uobject.h" -#include "unicode/unistr.h" +#include <_foundation_unicode/uobject.h> +#include <_foundation_unicode/unistr.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/tzfmt.cpp b/icuSources/i18n/tzfmt.cpp index 2199986..7623bad 100644 --- a/icuSources/i18n/tzfmt.cpp +++ b/icuSources/i18n/tzfmt.cpp @@ -7,18 +7,18 @@ ******************************************************************************* */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/calendar.h" -#include "unicode/tzfmt.h" -#include "unicode/numsys.h" -#include "unicode/strenum.h" -#include "unicode/uchar.h" -#include "unicode/udat.h" -#include "unicode/ustring.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/calendar.h> +#include <_foundation_unicode/tzfmt.h> +#include <_foundation_unicode/numsys.h> +#include <_foundation_unicode/strenum.h> +#include <_foundation_unicode/uchar.h> +#include <_foundation_unicode/udat.h> +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/utf16.h> #include "bytesinkutil.h" #include "charstr.h" #include "tzgnames.h" diff --git a/icuSources/i18n/tzgnames.cpp b/icuSources/i18n/tzgnames.cpp index e96dfd2..f1147a4 100644 --- a/icuSources/i18n/tzgnames.cpp +++ b/icuSources/i18n/tzgnames.cpp @@ -7,19 +7,19 @@ ******************************************************************************* */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #include "tzgnames.h" -#include "unicode/basictz.h" -#include "unicode/locdspnm.h" -#include "unicode/rbtz.h" -#include "unicode/simpleformatter.h" -#include "unicode/simpletz.h" -#include "unicode/strenum.h" -#include "unicode/vtzone.h" +#include <_foundation_unicode/basictz.h> +#include <_foundation_unicode/locdspnm.h> +#include <_foundation_unicode/rbtz.h> +#include <_foundation_unicode/simpleformatter.h> +#include <_foundation_unicode/simpletz.h> +#include <_foundation_unicode/strenum.h> +#include <_foundation_unicode/vtzone.h> #include "bytesinkutil.h" #include "charstr.h" diff --git a/icuSources/i18n/tzgnames.h b/icuSources/i18n/tzgnames.h index 26112c5..090aa35 100644 --- a/icuSources/i18n/tzgnames.h +++ b/icuSources/i18n/tzgnames.h @@ -14,14 +14,14 @@ * \brief C API: Time zone generic names classes */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/locid.h" -#include "unicode/unistr.h" -#include "unicode/tzfmt.h" -#include "unicode/tznames.h" +#include <_foundation_unicode/locid.h> +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/tzfmt.h> +#include <_foundation_unicode/tznames.h> U_CDECL_BEGIN diff --git a/icuSources/i18n/tznames.cpp b/icuSources/i18n/tznames.cpp index ef42667..d6ef255 100644 --- a/icuSources/i18n/tznames.cpp +++ b/icuSources/i18n/tznames.cpp @@ -7,13 +7,13 @@ ******************************************************************************* */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/locid.h" -#include "unicode/tznames.h" -#include "unicode/uenum.h" +#include <_foundation_unicode/locid.h> +#include <_foundation_unicode/tznames.h> +#include <_foundation_unicode/uenum.h> #include "cmemory.h" #include "cstring.h" #include "mutex.h" diff --git a/icuSources/i18n/tznames_impl.cpp b/icuSources/i18n/tznames_impl.cpp index 2005c07..bdb42db 100644 --- a/icuSources/i18n/tznames_impl.cpp +++ b/icuSources/i18n/tznames_impl.cpp @@ -11,14 +11,14 @@ ******************************************************************************* */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/strenum.h" -#include "unicode/ustring.h" -#include "unicode/timezone.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/strenum.h> +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/timezone.h> +#include <_foundation_unicode/utf16.h> #include "tznames_impl.h" #include "bytesinkutil.h" diff --git a/icuSources/i18n/tznames_impl.h b/icuSources/i18n/tznames_impl.h index d047fa3..eddfaea 100644 --- a/icuSources/i18n/tznames_impl.h +++ b/icuSources/i18n/tznames_impl.h @@ -16,13 +16,13 @@ * \brief C++ API: TimeZoneNames object */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/tznames.h" -#include "unicode/ures.h" -#include "unicode/locid.h" +#include <_foundation_unicode/tznames.h> +#include <_foundation_unicode/ures.h> +#include <_foundation_unicode/locid.h> #include "uhash.h" #include "uvector.h" #include "umutex.h" diff --git a/icuSources/i18n/tzrule.cpp b/icuSources/i18n/tzrule.cpp index a98ecc8..de23d4a 100644 --- a/icuSources/i18n/tzrule.cpp +++ b/icuSources/i18n/tzrule.cpp @@ -9,12 +9,12 @@ #include "utypeinfo.h" // for 'typeid' to work -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/tzrule.h" -#include "unicode/ucal.h" +#include <_foundation_unicode/tzrule.h> +#include <_foundation_unicode/ucal.h> #include "gregoimp.h" #include "cmemory.h" #include "uarrsort.h" diff --git a/icuSources/i18n/tztrans.cpp b/icuSources/i18n/tztrans.cpp index 900e4be..beab4de 100644 --- a/icuSources/i18n/tztrans.cpp +++ b/icuSources/i18n/tztrans.cpp @@ -9,12 +9,12 @@ #include "utypeinfo.h" // for 'typeid' to work -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/tzrule.h" -#include "unicode/tztrans.h" +#include <_foundation_unicode/tzrule.h> +#include <_foundation_unicode/tztrans.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/uameasureformat.cpp b/icuSources/i18n/uameasureformat.cpp index d0cbf3e..c424947 100644 --- a/icuSources/i18n/uameasureformat.cpp +++ b/icuSources/i18n/uameasureformat.cpp @@ -4,22 +4,22 @@ ***************************************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #include -#include "unicode/uameasureformat.h" -#include "unicode/fieldpos.h" -#include "unicode/localpointer.h" -#include "unicode/numfmt.h" -#include "unicode/measunit.h" -#include "unicode/measure.h" -#include "unicode/measfmt.h" -#include "unicode/unistr.h" -#include "unicode/unum.h" -#include "unicode/umisc.h" -#include "unicode/ures.h" +#include <_foundation_unicode/uameasureformat.h> +#include <_foundation_unicode/fieldpos.h> +#include <_foundation_unicode/localpointer.h> +#include <_foundation_unicode/numfmt.h> +#include <_foundation_unicode/measunit.h> +#include <_foundation_unicode/measure.h> +#include <_foundation_unicode/measfmt.h> +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/unum.h> +#include <_foundation_unicode/umisc.h> +#include <_foundation_unicode/ures.h> #include "uresimp.h" #include "ustr_imp.h" #include "cstring.h" diff --git a/icuSources/i18n/uatimeunitformat.cpp b/icuSources/i18n/uatimeunitformat.cpp index 37cb849..8fac0e7 100644 --- a/icuSources/i18n/uatimeunitformat.cpp +++ b/icuSources/i18n/uatimeunitformat.cpp @@ -4,21 +4,21 @@ ***************************************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/uatimeunitformat.h" -#include "unicode/fieldpos.h" -#include "unicode/localpointer.h" -#include "unicode/numfmt.h" -#include "unicode/measunit.h" -#include "unicode/measure.h" -#include "unicode/measfmt.h" -#include "unicode/unistr.h" -#include "unicode/unum.h" -#include "unicode/ures.h" -#include "unicode/ustring.h" +#include <_foundation_unicode/uatimeunitformat.h> +#include <_foundation_unicode/fieldpos.h> +#include <_foundation_unicode/localpointer.h> +#include <_foundation_unicode/numfmt.h> +#include <_foundation_unicode/measunit.h> +#include <_foundation_unicode/measure.h> +#include <_foundation_unicode/measfmt.h> +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/unum.h> +#include <_foundation_unicode/ures.h> +#include <_foundation_unicode/ustring.h> #include "ureslocs.h" #include "uresimp.h" #include "ustr_imp.h" diff --git a/icuSources/i18n/ucal.cpp b/icuSources/i18n/ucal.cpp index b67e1a1..7b70edb 100644 --- a/icuSources/i18n/ucal.cpp +++ b/icuSources/i18n/ucal.cpp @@ -9,7 +9,7 @@ #include "utypeinfo.h" // for 'typeid' to work -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING @@ -18,15 +18,15 @@ #include // Apple addition for uacal_getDayPeriod #endif // APPLE_ICU_CHANGES -#include "unicode/ucal.h" -#include "unicode/uloc.h" -#include "unicode/calendar.h" -#include "unicode/timezone.h" -#include "unicode/gregocal.h" -#include "unicode/simpletz.h" -#include "unicode/ustring.h" -#include "unicode/strenum.h" -#include "unicode/localpointer.h" +#include <_foundation_unicode/ucal.h> +#include <_foundation_unicode/uloc.h> +#include <_foundation_unicode/calendar.h> +#include <_foundation_unicode/timezone.h> +#include <_foundation_unicode/gregocal.h> +#include <_foundation_unicode/simpletz.h> +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/strenum.h> +#include <_foundation_unicode/localpointer.h> #include "cmemory.h" #include "cstring.h" #include "ustrenum.h" diff --git a/icuSources/i18n/ucln_in.h b/icuSources/i18n/ucln_in.h index 765cdd5..69298be 100644 --- a/icuSources/i18n/ucln_in.h +++ b/icuSources/i18n/ucln_in.h @@ -17,7 +17,7 @@ #ifndef __UCLN_IN_H__ #define __UCLN_IN_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #include "ucln.h" /* diff --git a/icuSources/i18n/ucol.cpp b/icuSources/i18n/ucol.cpp index 8e1df8d..8709396 100644 --- a/icuSources/i18n/ucol.cpp +++ b/icuSources/i18n/ucol.cpp @@ -19,16 +19,16 @@ * 2012-2014 markus Rewritten in C++ again. */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_COLLATION -#include "unicode/coll.h" -#include "unicode/tblcoll.h" -#include "unicode/bytestream.h" -#include "unicode/coleitr.h" -#include "unicode/ucoleitr.h" -#include "unicode/ustring.h" +#include <_foundation_unicode/coll.h> +#include <_foundation_unicode/tblcoll.h> +#include <_foundation_unicode/bytestream.h> +#include <_foundation_unicode/coleitr.h> +#include <_foundation_unicode/ucoleitr.h> +#include <_foundation_unicode/ustring.h> #include "cmemory.h" #include "collation.h" #include "cstring.h" diff --git a/icuSources/i18n/ucol_imp.h b/icuSources/i18n/ucol_imp.h index f463957..acfb51c 100644 --- a/icuSources/i18n/ucol_imp.h +++ b/icuSources/i18n/ucol_imp.h @@ -28,13 +28,13 @@ #ifndef UCOL_IMP_H #define UCOL_IMP_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_COLLATION // This part needs to compile as plain C code, for cintltst. -#include "unicode/ucol.h" +#include <_foundation_unicode/ucol.h> /** Check whether two collators are equal. Collators are considered equal if they * will sort strings the same. This means that both the current attributes and the @@ -54,8 +54,8 @@ ucol_equals(const UCollator *source, const UCollator *target); #ifdef __cplusplus -#include "unicode/locid.h" -#include "unicode/ures.h" +#include <_foundation_unicode/locid.h> +#include <_foundation_unicode/ures.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/ucol_res.cpp b/icuSources/i18n/ucol_res.cpp index b7f334f..66d9ed8 100644 --- a/icuSources/i18n/ucol_res.cpp +++ b/icuSources/i18n/ucol_res.cpp @@ -24,18 +24,18 @@ * 2012-2014 markus Rewritten in C++ again. */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_COLLATION -#include "unicode/coll.h" -#include "unicode/localpointer.h" -#include "unicode/locid.h" -#include "unicode/tblcoll.h" -#include "unicode/ucol.h" -#include "unicode/uloc.h" -#include "unicode/unistr.h" -#include "unicode/ures.h" +#include <_foundation_unicode/coll.h> +#include <_foundation_unicode/localpointer.h> +#include <_foundation_unicode/locid.h> +#include <_foundation_unicode/tblcoll.h> +#include <_foundation_unicode/ucol.h> +#include <_foundation_unicode/uloc.h> +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/ures.h> #include "charstr.h" #include "cmemory.h" #include "cstring.h" diff --git a/icuSources/i18n/ucol_sit.cpp b/icuSources/i18n/ucol_sit.cpp index 19281e4..ff06d43 100644 --- a/icuSources/i18n/ucol_sit.cpp +++ b/icuSources/i18n/ucol_sit.cpp @@ -15,16 +15,16 @@ * 03/12/2004 weiv Creation */ -#include "unicode/ustring.h" -#include "unicode/udata.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/udata.h> +#include <_foundation_unicode/utf16.h> #include "utracimp.h" #include "ucol_imp.h" #include "cmemory.h" #include "cstring.h" #include "uresimp.h" -#include "unicode/coll.h" -#include "unicode/stringpiece.h" +#include <_foundation_unicode/coll.h> +#include <_foundation_unicode/stringpiece.h> #include "charstr.h" U_NAMESPACE_USE @@ -35,7 +35,7 @@ U_NAMESPACE_USE #if !UCONFIG_NO_COLLATION -#include "unicode/tblcoll.h" +#include <_foundation_unicode/tblcoll.h> enum OptionsList { UCOL_SIT_LANGUAGE = 0, diff --git a/icuSources/i18n/ucoleitr.cpp b/icuSources/i18n/ucoleitr.cpp index 99601d2..80bd0ab 100644 --- a/icuSources/i18n/ucoleitr.cpp +++ b/icuSources/i18n/ucoleitr.cpp @@ -16,16 +16,16 @@ * 2012-2014 markus Rewritten in C++ again. ******************************************************************************/ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_COLLATION -#include "unicode/coleitr.h" -#include "unicode/tblcoll.h" -#include "unicode/ucoleitr.h" -#include "unicode/ustring.h" -#include "unicode/sortkey.h" -#include "unicode/uobject.h" +#include <_foundation_unicode/coleitr.h> +#include <_foundation_unicode/tblcoll.h> +#include <_foundation_unicode/ucoleitr.h> +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/sortkey.h> +#include <_foundation_unicode/uobject.h> #include "cmemory.h" #include "usrchimp.h" diff --git a/icuSources/i18n/ucsdet.cpp b/icuSources/i18n/ucsdet.cpp index 8de10d1..cd7484e 100644 --- a/icuSources/i18n/ucsdet.cpp +++ b/icuSources/i18n/ucsdet.cpp @@ -7,10 +7,10 @@ ******************************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_CONVERSION -#include "unicode/ucsdet.h" +#include <_foundation_unicode/ucsdet.h> #include "csdetect.h" #include "csmatch.h" #include "csrsbcs.h" diff --git a/icuSources/i18n/udat.cpp b/icuSources/i18n/udat.cpp index 77e604c..219ff69 100644 --- a/icuSources/i18n/udat.cpp +++ b/icuSources/i18n/udat.cpp @@ -7,27 +7,27 @@ ******************************************************************************* */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/udat.h" - -#include "unicode/uloc.h" -#include "unicode/datefmt.h" -#include "unicode/timezone.h" -#include "unicode/smpdtfmt.h" -#include "unicode/fieldpos.h" -#include "unicode/parsepos.h" -#include "unicode/calendar.h" -#include "unicode/numfmt.h" -#include "unicode/dtfmtsym.h" -#include "unicode/ustring.h" -#include "unicode/udisplaycontext.h" -#include "unicode/ufieldpositer.h" +#include <_foundation_unicode/udat.h> + +#include <_foundation_unicode/uloc.h> +#include <_foundation_unicode/datefmt.h> +#include <_foundation_unicode/timezone.h> +#include <_foundation_unicode/smpdtfmt.h> +#include <_foundation_unicode/fieldpos.h> +#include <_foundation_unicode/parsepos.h> +#include <_foundation_unicode/calendar.h> +#include <_foundation_unicode/numfmt.h> +#include <_foundation_unicode/dtfmtsym.h> +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/udisplaycontext.h> +#include <_foundation_unicode/ufieldpositer.h> #if APPLE_ICU_CHANGES // rdar:// -#include "unicode/ucasemap.h" +#include <_foundation_unicode/ucasemap.h> #endif // APPLE_ICU_CHANGES #include "cpputils.h" #include "reldtfmt.h" diff --git a/icuSources/i18n/udateintervalformat.cpp b/icuSources/i18n/udateintervalformat.cpp index bb60894..76d91de 100644 --- a/icuSources/i18n/udateintervalformat.cpp +++ b/icuSources/i18n/udateintervalformat.cpp @@ -7,18 +7,18 @@ ***************************************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/udateintervalformat.h" -#include "unicode/dtitvfmt.h" -#include "unicode/dtintrv.h" -#include "unicode/localpointer.h" -#include "unicode/timezone.h" -#include "unicode/locid.h" -#include "unicode/unistr.h" -#include "unicode/udisplaycontext.h" +#include <_foundation_unicode/udateintervalformat.h> +#include <_foundation_unicode/dtitvfmt.h> +#include <_foundation_unicode/dtintrv.h> +#include <_foundation_unicode/localpointer.h> +#include <_foundation_unicode/timezone.h> +#include <_foundation_unicode/locid.h> +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/udisplaycontext.h> #include "formattedval_impl.h" U_NAMESPACE_USE diff --git a/icuSources/i18n/udatintv.cpp b/icuSources/i18n/udatintv.cpp index 49c5aca..f9df442 100644 --- a/icuSources/i18n/udatintv.cpp +++ b/icuSources/i18n/udatintv.cpp @@ -4,12 +4,12 @@ ***************************************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/udateintervalformat.h" -#include "unicode/udatintv.h" +#include <_foundation_unicode/udateintervalformat.h> +#include <_foundation_unicode/udatintv.h> U_NAMESPACE_USE diff --git a/icuSources/i18n/udatpg.cpp b/icuSources/i18n/udatpg.cpp index 4319fac..5b4f752 100644 --- a/icuSources/i18n/udatpg.cpp +++ b/icuSources/i18n/udatpg.cpp @@ -16,18 +16,18 @@ * created by: Markus W. Scherer */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/udatpg.h" -#include "unicode/uenum.h" -#include "unicode/strenum.h" -#include "unicode/dtptngen.h" +#include <_foundation_unicode/udatpg.h> +#include <_foundation_unicode/uenum.h> +#include <_foundation_unicode/strenum.h> +#include <_foundation_unicode/dtptngen.h> #if APPLE_ICU_CHANGES // rdar:// -#include "unicode/unistr.h" -#include "unicode/uchar.h" +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/uchar.h> #endif // APPLE_ICU_CHANGES #include "ustrenum.h" #if APPLE_ICU_CHANGES diff --git a/icuSources/i18n/ufieldpositer.cpp b/icuSources/i18n/ufieldpositer.cpp index 64de856..3d077b3 100644 --- a/icuSources/i18n/ufieldpositer.cpp +++ b/icuSources/i18n/ufieldpositer.cpp @@ -7,13 +7,13 @@ ***************************************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/ufieldpositer.h" -#include "unicode/fpositer.h" -#include "unicode/localpointer.h" +#include <_foundation_unicode/ufieldpositer.h> +#include <_foundation_unicode/fpositer.h> +#include <_foundation_unicode/localpointer.h> U_NAMESPACE_USE diff --git a/icuSources/i18n/uitercollationiterator.cpp b/icuSources/i18n/uitercollationiterator.cpp index 26cd75a..7f64bde 100644 --- a/icuSources/i18n/uitercollationiterator.cpp +++ b/icuSources/i18n/uitercollationiterator.cpp @@ -11,11 +11,11 @@ * created by: Markus W. Scherer */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_COLLATION -#include "unicode/uiter.h" +#include <_foundation_unicode/uiter.h> #include "charstr.h" #include "cmemory.h" #include "collation.h" diff --git a/icuSources/i18n/uitercollationiterator.h b/icuSources/i18n/uitercollationiterator.h index e0da353..888e339 100644 --- a/icuSources/i18n/uitercollationiterator.h +++ b/icuSources/i18n/uitercollationiterator.h @@ -14,11 +14,11 @@ #ifndef __UITERCOLLATIONITERATOR_H__ #define __UITERCOLLATIONITERATOR_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_COLLATION -#include "unicode/uiter.h" +#include <_foundation_unicode/uiter.h> #include "cmemory.h" #include "collation.h" #include "collationdata.h" diff --git a/icuSources/i18n/ulistformatter.cpp b/icuSources/i18n/ulistformatter.cpp index 7e8b385..4c99de2 100644 --- a/icuSources/i18n/ulistformatter.cpp +++ b/icuSources/i18n/ulistformatter.cpp @@ -7,13 +7,13 @@ ***************************************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/ulistformatter.h" -#include "unicode/listformatter.h" -#include "unicode/localpointer.h" +#include <_foundation_unicode/ulistformatter.h> +#include <_foundation_unicode/listformatter.h> +#include <_foundation_unicode/localpointer.h> #include "cmemory.h" #include "formattedval_impl.h" diff --git a/icuSources/i18n/umsg.cpp b/icuSources/i18n/umsg.cpp index c2d5a9a..dec7a73 100644 --- a/icuSources/i18n/umsg.cpp +++ b/icuSources/i18n/umsg.cpp @@ -21,15 +21,15 @@ * */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/umsg.h" -#include "unicode/ustring.h" -#include "unicode/fmtable.h" -#include "unicode/msgfmt.h" -#include "unicode/unistr.h" +#include <_foundation_unicode/umsg.h> +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/fmtable.h> +#include <_foundation_unicode/msgfmt.h> +#include <_foundation_unicode/unistr.h> #include "cpputils.h" #include "uassert.h" #include "ustr_imp.h" diff --git a/icuSources/i18n/umsg_imp.h b/icuSources/i18n/umsg_imp.h index 43ef1c7..005a438 100644 --- a/icuSources/i18n/umsg_imp.h +++ b/icuSources/i18n/umsg_imp.h @@ -17,7 +17,7 @@ #ifndef UMISC_H #define UMISC_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING diff --git a/icuSources/i18n/unesctrn.cpp b/icuSources/i18n/unesctrn.cpp index fb431ff..c7ab6c8 100644 --- a/icuSources/i18n/unesctrn.cpp +++ b/icuSources/i18n/unesctrn.cpp @@ -10,12 +10,12 @@ ********************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_TRANSLITERATION -#include "unicode/uchar.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/uchar.h> +#include <_foundation_unicode/utf16.h> #include "unesctrn.h" #include "util.h" diff --git a/icuSources/i18n/unesctrn.h b/icuSources/i18n/unesctrn.h index e905c5b..1a34a98 100644 --- a/icuSources/i18n/unesctrn.h +++ b/icuSources/i18n/unesctrn.h @@ -12,11 +12,11 @@ #ifndef UNESCTRN_H #define UNESCTRN_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_TRANSLITERATION -#include "unicode/translit.h" +#include <_foundation_unicode/translit.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/uni2name.cpp b/icuSources/i18n/uni2name.cpp index 97df92b..9446d01 100644 --- a/icuSources/i18n/uni2name.cpp +++ b/icuSources/i18n/uni2name.cpp @@ -10,13 +10,13 @@ ********************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_TRANSLITERATION -#include "unicode/unifilt.h" -#include "unicode/uchar.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/unifilt.h> +#include <_foundation_unicode/uchar.h> +#include <_foundation_unicode/utf16.h> #include "uni2name.h" #include "cstring.h" #include "cmemory.h" diff --git a/icuSources/i18n/uni2name.h b/icuSources/i18n/uni2name.h index 1e01d78..2a3cc07 100644 --- a/icuSources/i18n/uni2name.h +++ b/icuSources/i18n/uni2name.h @@ -12,11 +12,11 @@ #ifndef UNI2NAME_H #define UNI2NAME_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_TRANSLITERATION -#include "unicode/translit.h" +#include <_foundation_unicode/translit.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/units_complexconverter.cpp b/icuSources/i18n/units_complexconverter.cpp index 6289ea0..62ab526 100644 --- a/icuSources/i18n/units_complexconverter.cpp +++ b/icuSources/i18n/units_complexconverter.cpp @@ -1,7 +1,7 @@ // © 2020 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING @@ -13,10 +13,10 @@ #include "putilimp.h" #include "uarrsort.h" #include "uassert.h" -#include "unicode/fmtable.h" -#include "unicode/localpointer.h" -#include "unicode/measunit.h" -#include "unicode/measure.h" +#include <_foundation_unicode/fmtable.h> +#include <_foundation_unicode/localpointer.h> +#include <_foundation_unicode/measunit.h> +#include <_foundation_unicode/measure.h> #include "units_complexconverter.h" #include "units_converter.h" diff --git a/icuSources/i18n/units_complexconverter.h b/icuSources/i18n/units_complexconverter.h index d56ce8d..99446c5 100644 --- a/icuSources/i18n/units_complexconverter.h +++ b/icuSources/i18n/units_complexconverter.h @@ -1,7 +1,7 @@ // © 2020 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #ifndef __UNITS_COMPLEXCONVERTER_H__ @@ -10,8 +10,8 @@ #include "cmemory.h" #include "measunit_impl.h" #include "number_roundingutils.h" -#include "unicode/errorcode.h" -#include "unicode/measure.h" +#include <_foundation_unicode/errorcode.h> +#include <_foundation_unicode/measure.h> #include "units_converter.h" #include "units_data.h" diff --git a/icuSources/i18n/units_converter.cpp b/icuSources/i18n/units_converter.cpp index b89f495..5b4a38b 100644 --- a/icuSources/i18n/units_converter.cpp +++ b/icuSources/i18n/units_converter.cpp @@ -1,7 +1,7 @@ // © 2020 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING @@ -11,9 +11,9 @@ #include "measunit_impl.h" #include "putilimp.h" #include "uassert.h" -#include "unicode/errorcode.h" -#include "unicode/localpointer.h" -#include "unicode/stringpiece.h" +#include <_foundation_unicode/errorcode.h> +#include <_foundation_unicode/localpointer.h> +#include <_foundation_unicode/stringpiece.h> #include "units_converter.h" #include #include diff --git a/icuSources/i18n/units_converter.h b/icuSources/i18n/units_converter.h index fd1d6ec..ba3af5c 100644 --- a/icuSources/i18n/units_converter.h +++ b/icuSources/i18n/units_converter.h @@ -1,7 +1,7 @@ // © 2020 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #ifndef __UNITS_CONVERTER_H__ @@ -9,9 +9,9 @@ #include "cmemory.h" #include "measunit_impl.h" -#include "unicode/errorcode.h" -#include "unicode/stringpiece.h" -#include "unicode/uobject.h" +#include <_foundation_unicode/errorcode.h> +#include <_foundation_unicode/stringpiece.h> +#include <_foundation_unicode/uobject.h> #include "units_converter.h" #include "units_data.h" diff --git a/icuSources/i18n/units_data.cpp b/icuSources/i18n/units_data.cpp index 1456af4..35e1f2d 100644 --- a/icuSources/i18n/units_data.cpp +++ b/icuSources/i18n/units_data.cpp @@ -1,7 +1,7 @@ // © 2020 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING @@ -10,9 +10,9 @@ #include "number_decimalquantity.h" #include "resource.h" #include "uassert.h" -#include "unicode/locid.h" -#include "unicode/unistr.h" -#include "unicode/ures.h" +#include <_foundation_unicode/locid.h> +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/ures.h> #include "units_data.h" #include "uresimp.h" #include "util.h" diff --git a/icuSources/i18n/units_data.h b/icuSources/i18n/units_data.h index 118458e..29bd1fe 100644 --- a/icuSources/i18n/units_data.h +++ b/icuSources/i18n/units_data.h @@ -1,7 +1,7 @@ // © 2020 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #ifndef __UNITS_DATA_H__ @@ -11,8 +11,8 @@ #include "charstr.h" #include "cmemory.h" -#include "unicode/stringpiece.h" -#include "unicode/uobject.h" +#include <_foundation_unicode/stringpiece.h> +#include <_foundation_unicode/uobject.h> U_NAMESPACE_BEGIN namespace units { diff --git a/icuSources/i18n/units_router.cpp b/icuSources/i18n/units_router.cpp index 1d4974d..5f88994 100644 --- a/icuSources/i18n/units_router.cpp +++ b/icuSources/i18n/units_router.cpp @@ -1,7 +1,7 @@ // © 2020 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING @@ -12,7 +12,7 @@ #include "number_decimalquantity.h" #include "number_roundingutils.h" #include "resource.h" -#include "unicode/measure.h" +#include <_foundation_unicode/measure.h> #include "units_data.h" #include "units_router.h" #include diff --git a/icuSources/i18n/units_router.h b/icuSources/i18n/units_router.h index 978fdf9..57483ad 100644 --- a/icuSources/i18n/units_router.h +++ b/icuSources/i18n/units_router.h @@ -1,7 +1,7 @@ // © 2020 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #ifndef __UNITS_ROUTER_H__ @@ -11,10 +11,10 @@ #include "cmemory.h" #include "measunit_impl.h" -#include "unicode/locid.h" -#include "unicode/measunit.h" -#include "unicode/stringpiece.h" -#include "unicode/uobject.h" +#include <_foundation_unicode/locid.h> +#include <_foundation_unicode/measunit.h> +#include <_foundation_unicode/stringpiece.h> +#include <_foundation_unicode/uobject.h> #include "units_complexconverter.h" #include "units_data.h" diff --git a/icuSources/i18n/unum.cpp b/icuSources/i18n/unum.cpp index 036c87a..ca11b9b 100644 --- a/icuSources/i18n/unum.cpp +++ b/icuSources/i18n/unum.cpp @@ -12,23 +12,23 @@ ******************************************************************************* */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/unum.h" - -#include "unicode/uloc.h" -#include "unicode/numfmt.h" -#include "unicode/decimfmt.h" -#include "unicode/rbnf.h" -#include "unicode/compactdecimalformat.h" -#include "unicode/ustring.h" -#include "unicode/fmtable.h" -#include "unicode/dcfmtsym.h" -#include "unicode/curramt.h" -#include "unicode/localpointer.h" -#include "unicode/udisplaycontext.h" +#include <_foundation_unicode/unum.h> + +#include <_foundation_unicode/uloc.h> +#include <_foundation_unicode/numfmt.h> +#include <_foundation_unicode/decimfmt.h> +#include <_foundation_unicode/rbnf.h> +#include <_foundation_unicode/compactdecimalformat.h> +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/fmtable.h> +#include <_foundation_unicode/dcfmtsym.h> +#include <_foundation_unicode/curramt.h> +#include <_foundation_unicode/localpointer.h> +#include <_foundation_unicode/udisplaycontext.h> #include "uassert.h" #include "cpputils.h" #include "cstring.h" diff --git a/icuSources/i18n/unumsys.cpp b/icuSources/i18n/unumsys.cpp index 4a0d0fa..18ff29a 100644 --- a/icuSources/i18n/unumsys.cpp +++ b/icuSources/i18n/unumsys.cpp @@ -7,13 +7,13 @@ ***************************************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/unumsys.h" -#include "unicode/numsys.h" -#include "unicode/uenum.h" +#include <_foundation_unicode/unumsys.h> +#include <_foundation_unicode/numsys.h> +#include <_foundation_unicode/uenum.h> U_NAMESPACE_USE diff --git a/icuSources/i18n/uplrule.cpp b/icuSources/i18n/uplrule.cpp index 5f93796..ebdc056 100644 --- a/icuSources/i18n/uplrule.cpp +++ b/icuSources/i18n/uplrule.cpp @@ -4,12 +4,12 @@ ***************************************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/upluralrules.h" -#include "unicode/uplrule.h" +#include <_foundation_unicode/upluralrules.h> +#include <_foundation_unicode/uplrule.h> U_NAMESPACE_USE diff --git a/icuSources/i18n/upluralrules.cpp b/icuSources/i18n/upluralrules.cpp index 93bfb5d..6dd7dbf 100644 --- a/icuSources/i18n/upluralrules.cpp +++ b/icuSources/i18n/upluralrules.cpp @@ -7,17 +7,17 @@ ***************************************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/upluralrules.h" -#include "unicode/plurrule.h" -#include "unicode/locid.h" -#include "unicode/unistr.h" -#include "unicode/unum.h" -#include "unicode/numfmt.h" -#include "unicode/unumberformatter.h" +#include <_foundation_unicode/upluralrules.h> +#include <_foundation_unicode/plurrule.h> +#include <_foundation_unicode/locid.h> +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/unum.h> +#include <_foundation_unicode/numfmt.h> +#include <_foundation_unicode/unumberformatter.h> #include "number_decimalquantity.h" #include "number_utypes.h" #include "numrange_impl.h" diff --git a/icuSources/i18n/uregex.cpp b/icuSources/i18n/uregex.cpp index dd2ad2a..f6858da 100644 --- a/icuSources/i18n/uregex.cpp +++ b/icuSources/i18n/uregex.cpp @@ -8,17 +8,17 @@ * file name: uregex.cpp */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_REGULAR_EXPRESSIONS -#include "unicode/regex.h" -#include "unicode/uregex.h" -#include "unicode/unistr.h" -#include "unicode/ustring.h" -#include "unicode/uchar.h" -#include "unicode/uobject.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/regex.h> +#include <_foundation_unicode/uregex.h> +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/uchar.h> +#include <_foundation_unicode/uobject.h> +#include <_foundation_unicode/utf16.h> #include "cmemory.h" #include "uassert.h" #include "uhash.h" diff --git a/icuSources/i18n/uregexc.cpp b/icuSources/i18n/uregexc.cpp index c7d3bcd..151c4db 100644 --- a/icuSources/i18n/uregexc.cpp +++ b/icuSources/i18n/uregexc.cpp @@ -11,8 +11,8 @@ * dependency on codepage conversion, which reduces the overhead of */ -#include "unicode/uregex.h" -#include "unicode/unistr.h" +#include <_foundation_unicode/uregex.h> +#include <_foundation_unicode/unistr.h> U_NAMESPACE_USE diff --git a/icuSources/i18n/uregion.cpp b/icuSources/i18n/uregion.cpp index 79a6237..7fa80d6 100644 --- a/icuSources/i18n/uregion.cpp +++ b/icuSources/i18n/uregion.cpp @@ -7,14 +7,14 @@ ***************************************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/uregion.h" -#include "unicode/region.h" -#include "unicode/uenum.h" -#include "unicode/strenum.h" +#include <_foundation_unicode/uregion.h> +#include <_foundation_unicode/region.h> +#include <_foundation_unicode/uenum.h> +#include <_foundation_unicode/strenum.h> U_NAMESPACE_USE diff --git a/icuSources/i18n/usearch.cpp b/icuSources/i18n/usearch.cpp index 966a900..09e5099 100644 --- a/icuSources/i18n/usearch.cpp +++ b/icuSources/i18n/usearch.cpp @@ -9,14 +9,14 @@ ********************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_COLLATION && !UCONFIG_NO_BREAK_ITERATION -#include "unicode/usearch.h" -#include "unicode/ustring.h" -#include "unicode/uchar.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/usearch.h> +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/uchar.h> +#include <_foundation_unicode/utf16.h> #include "normalizer2impl.h" #include "usrchimp.h" #include "cmemory.h" diff --git a/icuSources/i18n/uspoof.cpp b/icuSources/i18n/uspoof.cpp index f894dc4..206e0b2 100644 --- a/icuSources/i18n/uspoof.cpp +++ b/icuSources/i18n/uspoof.cpp @@ -15,11 +15,11 @@ * * Unicode Spoof Detection */ -#include "unicode/utypes.h" -#include "unicode/normalizer2.h" -#include "unicode/uspoof.h" -#include "unicode/ustring.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/normalizer2.h> +#include <_foundation_unicode/uspoof.h> +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/utf16.h> #include "cmemory.h" #include "cstring.h" #include "mutex.h" diff --git a/icuSources/i18n/uspoof_build.cpp b/icuSources/i18n/uspoof_build.cpp index 192fb9a..7471f21 100644 --- a/icuSources/i18n/uspoof_build.cpp +++ b/icuSources/i18n/uspoof_build.cpp @@ -25,11 +25,11 @@ * The data tables for each are built separately, each from its own definitions */ -#include "unicode/utypes.h" -#include "unicode/uspoof.h" -#include "unicode/unorm.h" -#include "unicode/uregex.h" -#include "unicode/ustring.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/uspoof.h> +#include <_foundation_unicode/unorm.h> +#include <_foundation_unicode/uregex.h> +#include <_foundation_unicode/ustring.h> #include "cmemory.h" #include "uspoof_impl.h" #include "uhash.h" diff --git a/icuSources/i18n/uspoof_conf.cpp b/icuSources/i18n/uspoof_conf.cpp index 5ecc59c..ef55d55 100644 --- a/icuSources/i18n/uspoof_conf.cpp +++ b/icuSources/i18n/uspoof_conf.cpp @@ -18,14 +18,14 @@ * Internal classes for compiling confusable data into its binary (runtime) form. */ -#include "unicode/utypes.h" -#include "unicode/uspoof.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/uspoof.h> #if !UCONFIG_NO_REGULAR_EXPRESSIONS #if !UCONFIG_NO_NORMALIZATION -#include "unicode/unorm.h" -#include "unicode/uregex.h" -#include "unicode/ustring.h" +#include <_foundation_unicode/unorm.h> +#include <_foundation_unicode/uregex.h> +#include <_foundation_unicode/ustring.h> #include "cmemory.h" #include "uspoof_impl.h" #include "uhash.h" diff --git a/icuSources/i18n/uspoof_conf.h b/icuSources/i18n/uspoof_conf.h index 1eeecdf..7331af7 100644 --- a/icuSources/i18n/uspoof_conf.h +++ b/icuSources/i18n/uspoof_conf.h @@ -21,13 +21,13 @@ #ifndef __USPOOF_BUILDCONF_H__ #define __USPOOF_BUILDCONF_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_NORMALIZATION #if !UCONFIG_NO_REGULAR_EXPRESSIONS -#include "unicode/uregex.h" +#include <_foundation_unicode/uregex.h> #include "uhash.h" #include "uspoof_impl.h" diff --git a/icuSources/i18n/uspoof_impl.cpp b/icuSources/i18n/uspoof_impl.cpp index e50344c..7614998 100644 --- a/icuSources/i18n/uspoof_impl.cpp +++ b/icuSources/i18n/uspoof_impl.cpp @@ -7,11 +7,11 @@ ********************************************************************** */ -#include "unicode/utypes.h" -#include "unicode/uspoof.h" -#include "unicode/uchar.h" -#include "unicode/uniset.h" -#include "unicode/utf16.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/uspoof.h> +#include <_foundation_unicode/uchar.h> +#include <_foundation_unicode/uniset.h> +#include <_foundation_unicode/utf16.h> #include "utrie2.h" #include "cmemory.h" #include "cstring.h" diff --git a/icuSources/i18n/uspoof_impl.h b/icuSources/i18n/uspoof_impl.h index 68d7bed..5ff6825 100644 --- a/icuSources/i18n/uspoof_impl.h +++ b/icuSources/i18n/uspoof_impl.h @@ -16,10 +16,10 @@ #define USPOOFIM_H #include "uassert.h" -#include "unicode/utypes.h" -#include "unicode/uspoof.h" -#include "unicode/uscript.h" -#include "unicode/udata.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/uspoof.h> +#include <_foundation_unicode/uscript.h> +#include <_foundation_unicode/udata.h> #include "udataswp.h" #include "utrie2.h" diff --git a/icuSources/i18n/usrchimp.h b/icuSources/i18n/usrchimp.h index 7e46d09..918e7e2 100644 --- a/icuSources/i18n/usrchimp.h +++ b/icuSources/i18n/usrchimp.h @@ -11,14 +11,14 @@ #ifndef USRCHIMP_H #define USRCHIMP_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_COLLATION -#include "unicode/normalizer2.h" -#include "unicode/ucol.h" -#include "unicode/ucoleitr.h" -#include "unicode/ubrk.h" +#include <_foundation_unicode/normalizer2.h> +#include <_foundation_unicode/ucol.h> +#include <_foundation_unicode/ucoleitr.h> +#include <_foundation_unicode/ubrk.h> /* mask off anything but primary order */ #define UCOL_PRIMARYORDERMASK 0xffff0000 diff --git a/icuSources/i18n/utf16collationiterator.cpp b/icuSources/i18n/utf16collationiterator.cpp index 912163a..bb41ea5 100644 --- a/icuSources/i18n/utf16collationiterator.cpp +++ b/icuSources/i18n/utf16collationiterator.cpp @@ -11,7 +11,7 @@ * created by: Markus W. Scherer */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_COLLATION diff --git a/icuSources/i18n/utf16collationiterator.h b/icuSources/i18n/utf16collationiterator.h index 6db7051..f4412ac 100644 --- a/icuSources/i18n/utf16collationiterator.h +++ b/icuSources/i18n/utf16collationiterator.h @@ -14,7 +14,7 @@ #ifndef __UTF16COLLATIONITERATOR_H__ #define __UTF16COLLATIONITERATOR_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_COLLATION diff --git a/icuSources/i18n/utf8collationiterator.cpp b/icuSources/i18n/utf8collationiterator.cpp index 5a6cf7f..4341399 100644 --- a/icuSources/i18n/utf8collationiterator.cpp +++ b/icuSources/i18n/utf8collationiterator.cpp @@ -11,11 +11,11 @@ * created by: Markus W. Scherer */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_COLLATION -#include "unicode/utf8.h" +#include <_foundation_unicode/utf8.h> #include "charstr.h" #include "cmemory.h" #include "collation.h" diff --git a/icuSources/i18n/utf8collationiterator.h b/icuSources/i18n/utf8collationiterator.h index 09cfce4..44eb9af 100644 --- a/icuSources/i18n/utf8collationiterator.h +++ b/icuSources/i18n/utf8collationiterator.h @@ -14,7 +14,7 @@ #ifndef __UTF8COLLATIONITERATOR_H__ #define __UTF8COLLATIONITERATOR_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_COLLATION diff --git a/icuSources/i18n/utmscale.cpp b/icuSources/i18n/utmscale.cpp index 7bf6eec..090f967 100644 --- a/icuSources/i18n/utmscale.cpp +++ b/icuSources/i18n/utmscale.cpp @@ -7,11 +7,11 @@ ******************************************************************************* */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/utmscale.h" +#include <_foundation_unicode/utmscale.h> #define ticks INT64_C(1) #define microseconds (ticks * 10) diff --git a/icuSources/i18n/utrans.cpp b/icuSources/i18n/utrans.cpp index 1cbba81..1631519 100644 --- a/icuSources/i18n/utrans.cpp +++ b/icuSources/i18n/utrans.cpp @@ -10,19 +10,19 @@ ******************************************************************************* */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_TRANSLITERATION -#include "unicode/utrans.h" -#include "unicode/putil.h" -#include "unicode/rep.h" -#include "unicode/translit.h" -#include "unicode/unifilt.h" -#include "unicode/uniset.h" -#include "unicode/ustring.h" -#include "unicode/uenum.h" -#include "unicode/uset.h" +#include <_foundation_unicode/utrans.h> +#include <_foundation_unicode/putil.h> +#include <_foundation_unicode/rep.h> +#include <_foundation_unicode/translit.h> +#include <_foundation_unicode/unifilt.h> +#include <_foundation_unicode/uniset.h> +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/uenum.h> +#include <_foundation_unicode/uset.h> #include "uenumimp.h" #include "cpputils.h" #include "rbt.h" diff --git a/icuSources/i18n/vtzone.cpp b/icuSources/i18n/vtzone.cpp index bd81ee7..8d9ccab 100644 --- a/icuSources/i18n/vtzone.cpp +++ b/icuSources/i18n/vtzone.cpp @@ -9,14 +9,14 @@ #include "utypeinfo.h" // for 'typeid' to work -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/vtzone.h" -#include "unicode/rbtz.h" -#include "unicode/ucal.h" -#include "unicode/ures.h" +#include <_foundation_unicode/vtzone.h> +#include <_foundation_unicode/rbtz.h> +#include <_foundation_unicode/ucal.h> +#include <_foundation_unicode/ures.h> #include "cmemory.h" #include "uvector.h" #include "gregoimp.h" diff --git a/icuSources/i18n/vzone.cpp b/icuSources/i18n/vzone.cpp index 7e3a554..3494396 100644 --- a/icuSources/i18n/vzone.cpp +++ b/icuSources/i18n/vzone.cpp @@ -12,16 +12,16 @@ * \brief C API: VTimeZone classes */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/uobject.h" +#include <_foundation_unicode/uobject.h> #include "vzone.h" -#include "unicode/vtzone.h" +#include <_foundation_unicode/vtzone.h> #include "cmemory.h" -#include "unicode/ustring.h" -#include "unicode/parsepos.h" +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/parsepos.h> U_NAMESPACE_USE diff --git a/icuSources/i18n/vzone.h b/icuSources/i18n/vzone.h index bf9b45e..1a55ad6 100644 --- a/icuSources/i18n/vzone.h +++ b/icuSources/i18n/vzone.h @@ -17,11 +17,11 @@ #ifndef __VZONE_H #define __VZONE_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/uobject.h" +#include <_foundation_unicode/uobject.h> #include "ztrans.h" struct VZone; diff --git a/icuSources/i18n/windtfmt.cpp b/icuSources/i18n/windtfmt.cpp index 4676fd0..99aa1e1 100644 --- a/icuSources/i18n/windtfmt.cpp +++ b/icuSources/i18n/windtfmt.cpp @@ -11,24 +11,24 @@ ******************************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_PLATFORM_USES_ONLY_WIN32_API #if !UCONFIG_NO_FORMATTING -#include "unicode/ures.h" -#include "unicode/format.h" -#include "unicode/fmtable.h" -#include "unicode/datefmt.h" -#include "unicode/simpleformatter.h" -#include "unicode/calendar.h" -#include "unicode/gregocal.h" -#include "unicode/locid.h" -#include "unicode/unistr.h" -#include "unicode/ustring.h" -#include "unicode/timezone.h" -#include "unicode/utmscale.h" +#include <_foundation_unicode/ures.h> +#include <_foundation_unicode/format.h> +#include <_foundation_unicode/fmtable.h> +#include <_foundation_unicode/datefmt.h> +#include <_foundation_unicode/simpleformatter.h> +#include <_foundation_unicode/calendar.h> +#include <_foundation_unicode/gregocal.h> +#include <_foundation_unicode/locid.h> +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/timezone.h> +#include <_foundation_unicode/utmscale.h> #include "cmemory.h" #include "uresimp.h" diff --git a/icuSources/i18n/windtfmt.h b/icuSources/i18n/windtfmt.h index 7fe7f68..62855eb 100644 --- a/icuSources/i18n/windtfmt.h +++ b/icuSources/i18n/windtfmt.h @@ -14,17 +14,17 @@ #ifndef __WINDTFMT #define __WINDTFMT -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_PLATFORM_USES_ONLY_WIN32_API #if !UCONFIG_NO_FORMATTING -#include "unicode/format.h" -#include "unicode/datefmt.h" -#include "unicode/calendar.h" -#include "unicode/ustring.h" -#include "unicode/locid.h" +#include <_foundation_unicode/format.h> +#include <_foundation_unicode/datefmt.h> +#include <_foundation_unicode/calendar.h> +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/locid.h> /** * \file diff --git a/icuSources/i18n/winnmfmt.cpp b/icuSources/i18n/winnmfmt.cpp index 377d1af..2fbde23 100644 --- a/icuSources/i18n/winnmfmt.cpp +++ b/icuSources/i18n/winnmfmt.cpp @@ -11,7 +11,7 @@ ******************************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_PLATFORM_USES_ONLY_WIN32_API @@ -19,10 +19,10 @@ #include "winnmfmt.h" -#include "unicode/format.h" -#include "unicode/numfmt.h" -#include "unicode/locid.h" -#include "unicode/ustring.h" +#include <_foundation_unicode/format.h> +#include <_foundation_unicode/numfmt.h> +#include <_foundation_unicode/locid.h> +#include <_foundation_unicode/ustring.h> #include "cmemory.h" #include "uassert.h" diff --git a/icuSources/i18n/winnmfmt.h b/icuSources/i18n/winnmfmt.h index 99571d2..04304e3 100644 --- a/icuSources/i18n/winnmfmt.h +++ b/icuSources/i18n/winnmfmt.h @@ -14,15 +14,15 @@ #ifndef __WINNMFMT #define __WINNMFMT -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_PLATFORM_USES_ONLY_WIN32_API -#include "unicode/format.h" -#include "unicode/datefmt.h" -#include "unicode/calendar.h" -#include "unicode/ustring.h" -#include "unicode/locid.h" +#include <_foundation_unicode/format.h> +#include <_foundation_unicode/datefmt.h> +#include <_foundation_unicode/calendar.h> +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/locid.h> #if !UCONFIG_NO_FORMATTING diff --git a/icuSources/i18n/wintzimpl.cpp b/icuSources/i18n/wintzimpl.cpp index 5f70d09..43715f1 100644 --- a/icuSources/i18n/wintzimpl.cpp +++ b/icuSources/i18n/wintzimpl.cpp @@ -11,15 +11,15 @@ ******************************************************************************** */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_PLATFORM_USES_ONLY_WIN32_API && !UCONFIG_NO_FORMATTING #include "wintzimpl.h" -#include "unicode/unistr.h" -#include "unicode/timezone.h" -#include "unicode/basictz.h" +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/timezone.h> +#include <_foundation_unicode/basictz.h> #include "putilimp.h" #include "uassert.h" #include "cmemory.h" diff --git a/icuSources/i18n/wintzimpl.h b/icuSources/i18n/wintzimpl.h index 772ea95..dc2f3fd 100644 --- a/icuSources/i18n/wintzimpl.h +++ b/icuSources/i18n/wintzimpl.h @@ -14,7 +14,7 @@ #ifndef __WINTZIMPL #define __WINTZIMPL -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_PLATFORM_USES_ONLY_WIN32_API /** diff --git a/icuSources/i18n/zonemeta.cpp b/icuSources/i18n/zonemeta.cpp index 5a17cbc..8f11d84 100644 --- a/icuSources/i18n/zonemeta.cpp +++ b/icuSources/i18n/zonemeta.cpp @@ -7,17 +7,17 @@ ******************************************************************************* */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #include "zonemeta.h" -#include "unicode/timezone.h" -#include "unicode/ustring.h" -#include "unicode/putil.h" -#include "unicode/simpletz.h" -#include "unicode/strenum.h" +#include <_foundation_unicode/timezone.h> +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/putil.h> +#include <_foundation_unicode/simpletz.h> +#include <_foundation_unicode/strenum.h> #include "umutex.h" #include "uvector.h" #include "cmemory.h" diff --git a/icuSources/i18n/zonemeta.h b/icuSources/i18n/zonemeta.h index 97c0e60..d0dbdab 100644 --- a/icuSources/i18n/zonemeta.h +++ b/icuSources/i18n/zonemeta.h @@ -9,11 +9,11 @@ #ifndef ZONEMETA_H #define ZONEMETA_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/unistr.h" +#include <_foundation_unicode/unistr.h> #include "hash.h" U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/zrule.cpp b/icuSources/i18n/zrule.cpp index bdf8496..3fb8b8b 100644 --- a/icuSources/i18n/zrule.cpp +++ b/icuSources/i18n/zrule.cpp @@ -12,16 +12,16 @@ * \brief C API: Time zone rule classes */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/uobject.h" +#include <_foundation_unicode/uobject.h> #include "zrule.h" -#include "unicode/tzrule.h" +#include <_foundation_unicode/tzrule.h> #include "cmemory.h" -#include "unicode/ustring.h" -#include "unicode/parsepos.h" +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/parsepos.h> U_NAMESPACE_USE diff --git a/icuSources/i18n/zrule.h b/icuSources/i18n/zrule.h index 2bea64c..7ef6204 100644 --- a/icuSources/i18n/zrule.h +++ b/icuSources/i18n/zrule.h @@ -14,11 +14,11 @@ * \brief C API: Time zone rule classes */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/uobject.h" +#include <_foundation_unicode/uobject.h> /** * A TimeZoneRule. Use the zrule_* API to manipulate. Create with diff --git a/icuSources/i18n/ztrans.cpp b/icuSources/i18n/ztrans.cpp index 9dbe9bb..4092886 100644 --- a/icuSources/i18n/ztrans.cpp +++ b/icuSources/i18n/ztrans.cpp @@ -12,16 +12,16 @@ * \brief C API: Time zone transition classes */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/uobject.h" +#include <_foundation_unicode/uobject.h> #include "ztrans.h" -#include "unicode/tztrans.h" +#include <_foundation_unicode/tztrans.h> #include "cmemory.h" -#include "unicode/ustring.h" -#include "unicode/parsepos.h" +#include <_foundation_unicode/ustring.h> +#include <_foundation_unicode/parsepos.h> U_NAMESPACE_USE diff --git a/icuSources/i18n/ztrans.h b/icuSources/i18n/ztrans.h index a1f3910..2358fc2 100644 --- a/icuSources/i18n/ztrans.h +++ b/icuSources/i18n/ztrans.h @@ -14,11 +14,11 @@ * \brief C API: Time zone transition classes */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING -#include "unicode/uobject.h" +#include <_foundation_unicode/uobject.h> /** * A TimeZoneTransition. Use the ztrans_* API to manipulate. Create with diff --git a/icuSources/i18n/include/unicode/alphaindex.h b/icuSources/include/_foundation_unicode/alphaindex.h similarity index 99% rename from icuSources/i18n/include/unicode/alphaindex.h rename to icuSources/include/_foundation_unicode/alphaindex.h index ec50822..ebb5592 100644 --- a/icuSources/i18n/include/unicode/alphaindex.h +++ b/icuSources/include/_foundation_unicode/alphaindex.h @@ -12,13 +12,13 @@ #ifndef INDEXCHARS_H #define INDEXCHARS_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API -#include "unicode/uobject.h" -#include "unicode/locid.h" -#include "unicode/unistr.h" +#include <_foundation_unicode/uobject.h> +#include <_foundation_unicode/locid.h> +#include <_foundation_unicode/unistr.h> #if !UCONFIG_NO_COLLATION diff --git a/icuSources/common/include/unicode/appendable.h b/icuSources/include/_foundation_unicode/appendable.h similarity index 99% rename from icuSources/common/include/unicode/appendable.h rename to icuSources/include/_foundation_unicode/appendable.h index f77df88..97e8a72 100644 --- a/icuSources/common/include/unicode/appendable.h +++ b/icuSources/include/_foundation_unicode/appendable.h @@ -22,11 +22,11 @@ * \brief C++ API: Appendable class: Sink for Unicode code points and 16-bit code units (char16_ts). */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API -#include "unicode/uobject.h" +#include <_foundation_unicode/uobject.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/include/unicode/basictz.h b/icuSources/include/_foundation_unicode/basictz.h similarity index 98% rename from icuSources/i18n/include/unicode/basictz.h rename to icuSources/include/_foundation_unicode/basictz.h index a1c94e5..29b505d 100644 --- a/icuSources/i18n/include/unicode/basictz.h +++ b/icuSources/include/_foundation_unicode/basictz.h @@ -14,15 +14,15 @@ * \brief C++ API: ICU TimeZone base class */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API #if !UCONFIG_NO_FORMATTING -#include "unicode/timezone.h" -#include "unicode/tzrule.h" -#include "unicode/tztrans.h" +#include <_foundation_unicode/timezone.h> +#include <_foundation_unicode/tzrule.h> +#include <_foundation_unicode/tztrans.h> U_NAMESPACE_BEGIN diff --git a/icuSources/common/include/unicode/brkiter.h b/icuSources/include/_foundation_unicode/brkiter.h similarity index 98% rename from icuSources/common/include/unicode/brkiter.h rename to icuSources/include/_foundation_unicode/brkiter.h index 9ed1039..a0ed40c 100644 --- a/icuSources/common/include/unicode/brkiter.h +++ b/icuSources/include/_foundation_unicode/brkiter.h @@ -22,14 +22,14 @@ #ifndef BRKITER_H #define BRKITER_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> /** * \file * \brief C++ API: Break Iterator. */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API @@ -47,14 +47,14 @@ U_NAMESPACE_END #else -#include "unicode/uobject.h" -#include "unicode/unistr.h" -#include "unicode/chariter.h" -#include "unicode/locid.h" -#include "unicode/ubrk.h" -#include "unicode/strenum.h" -#include "unicode/utext.h" -#include "unicode/umisc.h" +#include <_foundation_unicode/uobject.h> +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/chariter.h> +#include <_foundation_unicode/locid.h> +#include <_foundation_unicode/ubrk.h> +#include <_foundation_unicode/strenum.h> +#include <_foundation_unicode/utext.h> +#include <_foundation_unicode/umisc.h> U_NAMESPACE_BEGIN diff --git a/icuSources/common/include/unicode/bytestream.h b/icuSources/include/_foundation_unicode/bytestream.h similarity index 98% rename from icuSources/common/include/unicode/bytestream.h rename to icuSources/include/_foundation_unicode/bytestream.h index 997746e..02263bb 100644 --- a/icuSources/common/include/unicode/bytestream.h +++ b/icuSources/include/_foundation_unicode/bytestream.h @@ -37,12 +37,12 @@ * \brief C++ API: Interface for writing bytes, and implementation classes. */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API -#include "unicode/uobject.h" -#include "unicode/std_string.h" +#include <_foundation_unicode/uobject.h> +#include <_foundation_unicode/std_string.h> U_NAMESPACE_BEGIN diff --git a/icuSources/common/include/unicode/bytestrie.h b/icuSources/include/_foundation_unicode/bytestrie.h similarity index 99% rename from icuSources/common/include/unicode/bytestrie.h rename to icuSources/include/_foundation_unicode/bytestrie.h index 8fe6678..015f550 100644 --- a/icuSources/common/include/unicode/bytestrie.h +++ b/icuSources/include/_foundation_unicode/bytestrie.h @@ -22,13 +22,13 @@ * \brief C++ API: Trie for mapping byte sequences to integer values. */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API -#include "unicode/stringpiece.h" -#include "unicode/uobject.h" -#include "unicode/ustringtrie.h" +#include <_foundation_unicode/stringpiece.h> +#include <_foundation_unicode/uobject.h> +#include <_foundation_unicode/ustringtrie.h> class BytesTrieTest; diff --git a/icuSources/common/include/unicode/bytestriebuilder.h b/icuSources/include/_foundation_unicode/bytestriebuilder.h similarity index 97% rename from icuSources/common/include/unicode/bytestriebuilder.h rename to icuSources/include/_foundation_unicode/bytestriebuilder.h index ec9c625..3ed565a 100644 --- a/icuSources/common/include/unicode/bytestriebuilder.h +++ b/icuSources/include/_foundation_unicode/bytestriebuilder.h @@ -22,13 +22,13 @@ #ifndef __BYTESTRIEBUILDER_H__ #define __BYTESTRIEBUILDER_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API -#include "unicode/bytestrie.h" -#include "unicode/stringpiece.h" -#include "unicode/stringtriebuilder.h" +#include <_foundation_unicode/bytestrie.h> +#include <_foundation_unicode/stringpiece.h> +#include <_foundation_unicode/stringtriebuilder.h> class BytesTrieTest; diff --git a/icuSources/i18n/include/unicode/calendar.h b/icuSources/include/_foundation_unicode/calendar.h similarity index 99% rename from icuSources/i18n/include/unicode/calendar.h rename to icuSources/include/_foundation_unicode/calendar.h index e5c400a..bffc716 100644 --- a/icuSources/i18n/include/unicode/calendar.h +++ b/icuSources/include/_foundation_unicode/calendar.h @@ -27,7 +27,7 @@ #ifndef CALENDAR_H #define CALENDAR_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API @@ -37,11 +37,11 @@ */ #if !UCONFIG_NO_FORMATTING -#include "unicode/uobject.h" -#include "unicode/locid.h" -#include "unicode/timezone.h" -#include "unicode/ucal.h" -#include "unicode/umisc.h" +#include <_foundation_unicode/uobject.h> +#include <_foundation_unicode/locid.h> +#include <_foundation_unicode/timezone.h> +#include <_foundation_unicode/ucal.h> +#include <_foundation_unicode/umisc.h> U_NAMESPACE_BEGIN diff --git a/icuSources/common/include/unicode/caniter.h b/icuSources/include/_foundation_unicode/caniter.h similarity index 98% rename from icuSources/common/include/unicode/caniter.h rename to icuSources/include/_foundation_unicode/caniter.h index db400a5..d0f40b7 100644 --- a/icuSources/common/include/unicode/caniter.h +++ b/icuSources/include/_foundation_unicode/caniter.h @@ -10,14 +10,14 @@ #ifndef CANITER_H #define CANITER_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API #if !UCONFIG_NO_NORMALIZATION -#include "unicode/uobject.h" -#include "unicode/unistr.h" +#include <_foundation_unicode/uobject.h> +#include <_foundation_unicode/unistr.h> /** * \file diff --git a/icuSources/common/include/unicode/casemap.h b/icuSources/include/_foundation_unicode/casemap.h similarity index 99% rename from icuSources/common/include/unicode/casemap.h rename to icuSources/include/_foundation_unicode/casemap.h index 53af84f..39a14c1 100644 --- a/icuSources/common/include/unicode/casemap.h +++ b/icuSources/include/_foundation_unicode/casemap.h @@ -7,12 +7,12 @@ #ifndef __CASEMAP_H__ #define __CASEMAP_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API -#include "unicode/stringpiece.h" -#include "unicode/uobject.h" +#include <_foundation_unicode/stringpiece.h> +#include <_foundation_unicode/uobject.h> /** * \file diff --git a/icuSources/common/include/unicode/char16ptr.h b/icuSources/include/_foundation_unicode/char16ptr.h similarity index 99% rename from icuSources/common/include/unicode/char16ptr.h rename to icuSources/include/_foundation_unicode/char16ptr.h index c8a9ae6..877510a 100644 --- a/icuSources/common/include/unicode/char16ptr.h +++ b/icuSources/include/_foundation_unicode/char16ptr.h @@ -7,7 +7,7 @@ #ifndef __CHAR16PTR_H__ #define __CHAR16PTR_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API diff --git a/icuSources/common/include/unicode/chariter.h b/icuSources/include/_foundation_unicode/chariter.h similarity index 99% rename from icuSources/common/include/unicode/chariter.h rename to icuSources/include/_foundation_unicode/chariter.h index 4f320b9..ccdd4c3 100644 --- a/icuSources/common/include/unicode/chariter.h +++ b/icuSources/include/_foundation_unicode/chariter.h @@ -12,12 +12,12 @@ #ifndef CHARITER_H #define CHARITER_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API -#include "unicode/uobject.h" -#include "unicode/unistr.h" +#include <_foundation_unicode/uobject.h> +#include <_foundation_unicode/unistr.h> /** * \file * \brief C++ API: Character Iterator diff --git a/icuSources/i18n/include/unicode/choicfmt.h b/icuSources/include/_foundation_unicode/choicfmt.h similarity index 98% rename from icuSources/i18n/include/unicode/choicfmt.h rename to icuSources/include/_foundation_unicode/choicfmt.h index 66f437e..de9fc6b 100644 --- a/icuSources/i18n/include/unicode/choicfmt.h +++ b/icuSources/include/_foundation_unicode/choicfmt.h @@ -24,7 +24,7 @@ #ifndef CHOICFMT_H #define CHOICFMT_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API @@ -35,11 +35,11 @@ #if !UCONFIG_NO_FORMATTING -#include "unicode/fieldpos.h" -#include "unicode/format.h" -#include "unicode/messagepattern.h" -#include "unicode/numfmt.h" -#include "unicode/unistr.h" +#include <_foundation_unicode/fieldpos.h> +#include <_foundation_unicode/format.h> +#include <_foundation_unicode/messagepattern.h> +#include <_foundation_unicode/numfmt.h> +#include <_foundation_unicode/unistr.h> #ifndef U_HIDE_DEPRECATED_API @@ -144,8 +144,8 @@ class MessageFormat; *

Here is an example that shows formatting and parsing:

* * \code - * #include - * #include + * #include <_foundation_unicode/choicfmt.h> + * #include <_foundation_unicode/unistr.h> * #include * * int main(int argc, char *argv[]) { diff --git a/icuSources/i18n/include/unicode/coleitr.h b/icuSources/include/_foundation_unicode/coleitr.h similarity index 99% rename from icuSources/i18n/include/unicode/coleitr.h rename to icuSources/include/_foundation_unicode/coleitr.h index d3ddd0e..70f45cb 100644 --- a/icuSources/i18n/include/unicode/coleitr.h +++ b/icuSources/include/_foundation_unicode/coleitr.h @@ -33,14 +33,14 @@ #ifndef COLEITR_H #define COLEITR_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API #if !UCONFIG_NO_COLLATION -#include "unicode/unistr.h" -#include "unicode/uobject.h" +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/uobject.h> struct UCollationElements; struct UHashtable; diff --git a/icuSources/i18n/include/unicode/coll.h b/icuSources/include/_foundation_unicode/coll.h similarity index 99% rename from icuSources/i18n/include/unicode/coll.h rename to icuSources/include/_foundation_unicode/coll.h index 6aa35bb..058cf97 100644 --- a/icuSources/i18n/include/unicode/coll.h +++ b/icuSources/include/_foundation_unicode/coll.h @@ -52,20 +52,20 @@ #ifndef COLL_H #define COLL_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API #if !UCONFIG_NO_COLLATION -#include "unicode/uobject.h" -#include "unicode/ucol.h" -#include "unicode/unorm.h" -#include "unicode/locid.h" -#include "unicode/uniset.h" -#include "unicode/umisc.h" -#include "unicode/uiter.h" -#include "unicode/stringpiece.h" +#include <_foundation_unicode/uobject.h> +#include <_foundation_unicode/ucol.h> +#include <_foundation_unicode/unorm.h> +#include <_foundation_unicode/locid.h> +#include <_foundation_unicode/uniset.h> +#include <_foundation_unicode/umisc.h> +#include <_foundation_unicode/uiter.h> +#include <_foundation_unicode/stringpiece.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/include/unicode/compactdecimalformat.h b/icuSources/include/_foundation_unicode/compactdecimalformat.h similarity index 98% rename from icuSources/i18n/include/unicode/compactdecimalformat.h rename to icuSources/include/_foundation_unicode/compactdecimalformat.h index 9c1e200..a228336 100644 --- a/icuSources/i18n/include/unicode/compactdecimalformat.h +++ b/icuSources/include/_foundation_unicode/compactdecimalformat.h @@ -13,7 +13,7 @@ #ifndef __COMPACT_DECIMAL_FORMAT_H__ #define __COMPACT_DECIMAL_FORMAT_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API @@ -24,7 +24,7 @@ #if !UCONFIG_NO_FORMATTING -#include "unicode/decimfmt.h" +#include <_foundation_unicode/decimfmt.h> struct UHashtable; diff --git a/icuSources/i18n/include/unicode/curramt.h b/icuSources/include/_foundation_unicode/curramt.h similarity index 96% rename from icuSources/i18n/include/unicode/curramt.h rename to icuSources/include/_foundation_unicode/curramt.h index 818b11a..734dad7 100644 --- a/icuSources/i18n/include/unicode/curramt.h +++ b/icuSources/include/_foundation_unicode/curramt.h @@ -13,14 +13,14 @@ #ifndef __CURRENCYAMOUNT_H__ #define __CURRENCYAMOUNT_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API #if !UCONFIG_NO_FORMATTING -#include "unicode/measure.h" -#include "unicode/currunit.h" +#include <_foundation_unicode/measure.h> +#include <_foundation_unicode/currunit.h> /** * \file diff --git a/icuSources/i18n/include/unicode/currpinf.h b/icuSources/include/_foundation_unicode/currpinf.h similarity index 98% rename from icuSources/i18n/include/unicode/currpinf.h rename to icuSources/include/_foundation_unicode/currpinf.h index e3ca34b..65334fd 100644 --- a/icuSources/i18n/include/unicode/currpinf.h +++ b/icuSources/include/_foundation_unicode/currpinf.h @@ -9,7 +9,7 @@ #ifndef CURRPINF_H #define CURRPINF_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API @@ -20,7 +20,7 @@ #if !UCONFIG_NO_FORMATTING -#include "unicode/unistr.h" +#include <_foundation_unicode/unistr.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/include/unicode/currunit.h b/icuSources/include/_foundation_unicode/currunit.h similarity index 98% rename from icuSources/i18n/include/unicode/currunit.h rename to icuSources/include/_foundation_unicode/currunit.h index 8da3f1f..6253b03 100644 --- a/icuSources/i18n/include/unicode/currunit.h +++ b/icuSources/include/_foundation_unicode/currunit.h @@ -13,13 +13,13 @@ #ifndef __CURRENCYUNIT_H__ #define __CURRENCYUNIT_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API #if !UCONFIG_NO_FORMATTING -#include "unicode/measunit.h" +#include <_foundation_unicode/measunit.h> /** * \file diff --git a/icuSources/i18n/include/unicode/datefmt.h b/icuSources/include/_foundation_unicode/datefmt.h similarity index 99% rename from icuSources/i18n/include/unicode/datefmt.h rename to icuSources/include/_foundation_unicode/datefmt.h index 027fb17..95c69c1 100644 --- a/icuSources/i18n/include/unicode/datefmt.h +++ b/icuSources/include/_foundation_unicode/datefmt.h @@ -21,19 +21,19 @@ #ifndef DATEFMT_H #define DATEFMT_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API #if !UCONFIG_NO_FORMATTING -#include "unicode/udat.h" -#include "unicode/calendar.h" -#include "unicode/numfmt.h" -#include "unicode/format.h" -#include "unicode/locid.h" -#include "unicode/enumset.h" -#include "unicode/udisplaycontext.h" +#include <_foundation_unicode/udat.h> +#include <_foundation_unicode/calendar.h> +#include <_foundation_unicode/numfmt.h> +#include <_foundation_unicode/format.h> +#include <_foundation_unicode/locid.h> +#include <_foundation_unicode/enumset.h> +#include <_foundation_unicode/udisplaycontext.h> /** * \file diff --git a/icuSources/common/include/unicode/dbbi.h b/icuSources/include/_foundation_unicode/dbbi.h similarity index 93% rename from icuSources/common/include/unicode/dbbi.h rename to icuSources/include/_foundation_unicode/dbbi.h index 3de9cc3..7d22e60 100644 --- a/icuSources/common/include/unicode/dbbi.h +++ b/icuSources/include/_foundation_unicode/dbbi.h @@ -13,11 +13,11 @@ #ifndef DBBI_H #define DBBI_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API -#include "unicode/rbbi.h" +#include <_foundation_unicode/rbbi.h> #if !UCONFIG_NO_BREAK_ITERATION diff --git a/icuSources/i18n/include/unicode/dcfmtsym.h b/icuSources/include/_foundation_unicode/dcfmtsym.h similarity index 98% rename from icuSources/i18n/include/unicode/dcfmtsym.h rename to icuSources/include/_foundation_unicode/dcfmtsym.h index dc903f5..e612270 100644 --- a/icuSources/i18n/include/unicode/dcfmtsym.h +++ b/icuSources/include/_foundation_unicode/dcfmtsym.h @@ -27,18 +27,18 @@ #ifndef DCFMTSYM_H #define DCFMTSYM_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API #if !UCONFIG_NO_FORMATTING -#include "unicode/uchar.h" -#include "unicode/uobject.h" -#include "unicode/locid.h" -#include "unicode/numsys.h" -#include "unicode/unum.h" -#include "unicode/unistr.h" +#include <_foundation_unicode/uchar.h> +#include <_foundation_unicode/uobject.h> +#include <_foundation_unicode/locid.h> +#include <_foundation_unicode/numsys.h> +#include <_foundation_unicode/unum.h> +#include <_foundation_unicode/unistr.h> /** * \file diff --git a/icuSources/i18n/include/unicode/decimfmt.h b/icuSources/include/_foundation_unicode/decimfmt.h similarity index 99% rename from icuSources/i18n/include/unicode/decimfmt.h rename to icuSources/include/_foundation_unicode/decimfmt.h index 5f68dfa..3526fca 100644 --- a/icuSources/i18n/include/unicode/decimfmt.h +++ b/icuSources/include/_foundation_unicode/decimfmt.h @@ -27,7 +27,7 @@ #ifndef DECIMFMT_H #define DECIMFMT_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API @@ -38,13 +38,13 @@ #if !UCONFIG_NO_FORMATTING -#include "unicode/dcfmtsym.h" -#include "unicode/numfmt.h" -#include "unicode/locid.h" -#include "unicode/fpositer.h" -#include "unicode/stringpiece.h" -#include "unicode/curramt.h" -#include "unicode/enumset.h" +#include <_foundation_unicode/dcfmtsym.h> +#include <_foundation_unicode/numfmt.h> +#include <_foundation_unicode/locid.h> +#include <_foundation_unicode/fpositer.h> +#include <_foundation_unicode/stringpiece.h> +#include <_foundation_unicode/curramt.h> +#include <_foundation_unicode/enumset.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/include/unicode/displayoptions.h b/icuSources/include/_foundation_unicode/displayoptions.h similarity index 98% rename from icuSources/i18n/include/unicode/displayoptions.h rename to icuSources/include/_foundation_unicode/displayoptions.h index 7bc763b..b91304c 100644 --- a/icuSources/i18n/include/unicode/displayoptions.h +++ b/icuSources/include/_foundation_unicode/displayoptions.h @@ -4,7 +4,7 @@ #ifndef __DISPLAYOPTIONS_H__ #define __DISPLAYOPTIONS_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API @@ -17,8 +17,8 @@ * This class is designed as a more modern version of the UDisplayContext mechanism. */ -#include "unicode/udisplayoptions.h" -#include "unicode/uversion.h" +#include <_foundation_unicode/udisplayoptions.h> +#include <_foundation_unicode/uversion.h> U_NAMESPACE_BEGIN diff --git a/icuSources/common/include/unicode/docmain.h b/icuSources/include/_foundation_unicode/docmain.h similarity index 100% rename from icuSources/common/include/unicode/docmain.h rename to icuSources/include/_foundation_unicode/docmain.h diff --git a/icuSources/i18n/include/unicode/dtfmtsym.h b/icuSources/include/_foundation_unicode/dtfmtsym.h similarity index 99% rename from icuSources/i18n/include/unicode/dtfmtsym.h rename to icuSources/include/_foundation_unicode/dtfmtsym.h index 62a9411..9b48849 100644 --- a/icuSources/i18n/include/unicode/dtfmtsym.h +++ b/icuSources/include/_foundation_unicode/dtfmtsym.h @@ -20,18 +20,18 @@ #ifndef DTFMTSYM_H #define DTFMTSYM_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API #if !UCONFIG_NO_FORMATTING -#include "unicode/calendar.h" -#include "unicode/strenum.h" -#include "unicode/uobject.h" -#include "unicode/locid.h" -#include "unicode/udat.h" -#include "unicode/ures.h" +#include <_foundation_unicode/calendar.h> +#include <_foundation_unicode/strenum.h> +#include <_foundation_unicode/uobject.h> +#include <_foundation_unicode/locid.h> +#include <_foundation_unicode/udat.h> +#include <_foundation_unicode/ures.h> /** * \file diff --git a/icuSources/common/include/unicode/dtintrv.h b/icuSources/include/_foundation_unicode/dtintrv.h similarity index 97% rename from icuSources/common/include/unicode/dtintrv.h rename to icuSources/include/_foundation_unicode/dtintrv.h index 8c172eb..bd82e1e 100644 --- a/icuSources/common/include/unicode/dtintrv.h +++ b/icuSources/include/_foundation_unicode/dtintrv.h @@ -14,11 +14,11 @@ #ifndef __DTINTRV_H__ #define __DTINTRV_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API -#include "unicode/uobject.h" +#include <_foundation_unicode/uobject.h> /** * \file diff --git a/icuSources/i18n/include/unicode/dtitvfmt.h b/icuSources/include/_foundation_unicode/dtitvfmt.h similarity index 99% rename from icuSources/i18n/include/unicode/dtitvfmt.h rename to icuSources/include/_foundation_unicode/dtitvfmt.h index e49591d..3ebcd2c 100644 --- a/icuSources/i18n/include/unicode/dtitvfmt.h +++ b/icuSources/include/_foundation_unicode/dtitvfmt.h @@ -14,7 +14,7 @@ #define __DTITVFMT_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API @@ -25,17 +25,17 @@ #if !UCONFIG_NO_FORMATTING -#include "unicode/ucal.h" -#include "unicode/smpdtfmt.h" -#include "unicode/dtintrv.h" -#include "unicode/dtitvinf.h" -#include "unicode/dtptngen.h" -#include "unicode/formattedvalue.h" -#include "unicode/udisplaycontext.h" +#include <_foundation_unicode/ucal.h> +#include <_foundation_unicode/smpdtfmt.h> +#include <_foundation_unicode/dtintrv.h> +#include <_foundation_unicode/dtitvinf.h> +#include <_foundation_unicode/dtptngen.h> +#include <_foundation_unicode/formattedvalue.h> +#include <_foundation_unicode/udisplaycontext.h> #if APPLE_ICU_CHANGES // rdar:// // Apple-specific -#include "unicode/udateintervalformat.h" +#include <_foundation_unicode/udateintervalformat.h> #endif // APPLE_ICU_CHANGES U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/include/unicode/dtitvinf.h b/icuSources/include/_foundation_unicode/dtitvinf.h similarity index 98% rename from icuSources/i18n/include/unicode/dtitvinf.h rename to icuSources/include/_foundation_unicode/dtitvinf.h index a1f4f42..4a687e7 100644 --- a/icuSources/i18n/include/unicode/dtitvinf.h +++ b/icuSources/include/_foundation_unicode/dtitvinf.h @@ -14,7 +14,7 @@ #ifndef __DTITVINF_H__ #define __DTITVINF_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API @@ -25,10 +25,10 @@ #if !UCONFIG_NO_FORMATTING -#include "unicode/udat.h" -#include "unicode/locid.h" -#include "unicode/ucal.h" -#include "unicode/dtptngen.h" +#include <_foundation_unicode/udat.h> +#include <_foundation_unicode/locid.h> +#include <_foundation_unicode/ucal.h> +#include <_foundation_unicode/dtptngen.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/include/unicode/dtptngen.h b/icuSources/include/_foundation_unicode/dtptngen.h similarity index 99% rename from icuSources/i18n/include/unicode/dtptngen.h rename to icuSources/include/_foundation_unicode/dtptngen.h index ad8db46..7adbf6a 100644 --- a/icuSources/i18n/include/unicode/dtptngen.h +++ b/icuSources/include/_foundation_unicode/dtptngen.h @@ -14,15 +14,15 @@ #ifndef __DTPTNGEN_H__ #define __DTPTNGEN_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API -#include "unicode/datefmt.h" -#include "unicode/locid.h" -#include "unicode/udat.h" -#include "unicode/udatpg.h" -#include "unicode/unistr.h" +#include <_foundation_unicode/datefmt.h> +#include <_foundation_unicode/locid.h> +#include <_foundation_unicode/udat.h> +#include <_foundation_unicode/udatpg.h> +#include <_foundation_unicode/unistr.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/include/unicode/dtrule.h b/icuSources/include/_foundation_unicode/dtrule.h similarity index 99% rename from icuSources/i18n/include/unicode/dtrule.h rename to icuSources/include/_foundation_unicode/dtrule.h index 19e94bc..1c9c7be 100644 --- a/icuSources/i18n/include/unicode/dtrule.h +++ b/icuSources/include/_foundation_unicode/dtrule.h @@ -9,7 +9,7 @@ #ifndef DTRULE_H #define DTRULE_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API @@ -20,7 +20,7 @@ #if !UCONFIG_NO_FORMATTING -#include "unicode/uobject.h" +#include <_foundation_unicode/uobject.h> U_NAMESPACE_BEGIN /** diff --git a/icuSources/common/include/unicode/edits.h b/icuSources/include/_foundation_unicode/edits.h similarity index 99% rename from icuSources/common/include/unicode/edits.h rename to icuSources/include/_foundation_unicode/edits.h index bfa07fa..84604db 100644 --- a/icuSources/common/include/unicode/edits.h +++ b/icuSources/include/_foundation_unicode/edits.h @@ -7,11 +7,11 @@ #ifndef __EDITS_H__ #define __EDITS_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API -#include "unicode/uobject.h" +#include <_foundation_unicode/uobject.h> /** * \file diff --git a/icuSources/common/include/unicode/enumset.h b/icuSources/include/_foundation_unicode/enumset.h similarity index 98% rename from icuSources/common/include/unicode/enumset.h rename to icuSources/include/_foundation_unicode/enumset.h index bde8c45..45ce73a 100644 --- a/icuSources/common/include/unicode/enumset.h +++ b/icuSources/include/_foundation_unicode/enumset.h @@ -17,7 +17,7 @@ #ifndef ENUMSET_H #define ENUMSET_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API diff --git a/icuSources/common/include/unicode/errorcode.h b/icuSources/include/_foundation_unicode/errorcode.h similarity index 98% rename from icuSources/common/include/unicode/errorcode.h rename to icuSources/include/_foundation_unicode/errorcode.h index fe7b518..81076ec 100644 --- a/icuSources/common/include/unicode/errorcode.h +++ b/icuSources/include/_foundation_unicode/errorcode.h @@ -25,11 +25,11 @@ * ICU C and C++ APIs from C++ user code. */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API -#include "unicode/uobject.h" +#include <_foundation_unicode/uobject.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/include/unicode/fieldpos.h b/icuSources/include/_foundation_unicode/fieldpos.h similarity index 99% rename from icuSources/i18n/include/unicode/fieldpos.h rename to icuSources/include/_foundation_unicode/fieldpos.h index b985f3b..c02b550 100644 --- a/icuSources/i18n/include/unicode/fieldpos.h +++ b/icuSources/include/_foundation_unicode/fieldpos.h @@ -24,7 +24,7 @@ #ifndef FIELDPOS_H #define FIELDPOS_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API @@ -35,7 +35,7 @@ #if !UCONFIG_NO_FORMATTING -#include "unicode/uobject.h" +#include <_foundation_unicode/uobject.h> U_NAMESPACE_BEGIN diff --git a/icuSources/common/include/unicode/filteredbrk.h b/icuSources/include/_foundation_unicode/filteredbrk.h similarity index 98% rename from icuSources/common/include/unicode/filteredbrk.h rename to icuSources/include/_foundation_unicode/filteredbrk.h index 8b07e39..fc56bdc 100644 --- a/icuSources/common/include/unicode/filteredbrk.h +++ b/icuSources/include/_foundation_unicode/filteredbrk.h @@ -10,11 +10,11 @@ #ifndef FILTEREDBRK_H #define FILTEREDBRK_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API -#include "unicode/brkiter.h" +#include <_foundation_unicode/brkiter.h> #if !UCONFIG_NO_BREAK_ITERATION && !UCONFIG_NO_FILTERED_BREAK_ITERATION diff --git a/icuSources/i18n/include/unicode/fmtable.h b/icuSources/include/_foundation_unicode/fmtable.h similarity index 99% rename from icuSources/i18n/include/unicode/fmtable.h rename to icuSources/include/_foundation_unicode/fmtable.h index e1c6dec..7a21fd5 100644 --- a/icuSources/i18n/include/unicode/fmtable.h +++ b/icuSources/include/_foundation_unicode/fmtable.h @@ -17,7 +17,7 @@ #ifndef FMTABLE_H #define FMTABLE_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API @@ -28,9 +28,9 @@ #if !UCONFIG_NO_FORMATTING -#include "unicode/unistr.h" -#include "unicode/stringpiece.h" -#include "unicode/uformattable.h" +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/stringpiece.h> +#include <_foundation_unicode/uformattable.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/include/unicode/format.h b/icuSources/include/_foundation_unicode/format.h similarity index 97% rename from icuSources/i18n/include/unicode/format.h rename to icuSources/include/_foundation_unicode/format.h index 61425ef..c2fa199 100644 --- a/icuSources/i18n/include/unicode/format.h +++ b/icuSources/include/_foundation_unicode/format.h @@ -24,7 +24,7 @@ #define FORMAT_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API @@ -35,13 +35,13 @@ #if !UCONFIG_NO_FORMATTING -#include "unicode/unistr.h" -#include "unicode/fmtable.h" -#include "unicode/fieldpos.h" -#include "unicode/fpositer.h" -#include "unicode/parsepos.h" -#include "unicode/parseerr.h" -#include "unicode/locid.h" +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/fmtable.h> +#include <_foundation_unicode/fieldpos.h> +#include <_foundation_unicode/fpositer.h> +#include <_foundation_unicode/parsepos.h> +#include <_foundation_unicode/parseerr.h> +#include <_foundation_unicode/locid.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/include/unicode/formattedvalue.h b/icuSources/include/_foundation_unicode/formattedvalue.h similarity index 97% rename from icuSources/i18n/include/unicode/formattedvalue.h rename to icuSources/include/_foundation_unicode/formattedvalue.h index 5febea0..6e1181a 100644 --- a/icuSources/i18n/include/unicode/formattedvalue.h +++ b/icuSources/include/_foundation_unicode/formattedvalue.h @@ -4,16 +4,16 @@ #ifndef __FORMATTEDVALUE_H__ #define __FORMATTEDVALUE_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API #if !UCONFIG_NO_FORMATTING -#include "unicode/appendable.h" -#include "unicode/fpositer.h" -#include "unicode/unistr.h" -#include "unicode/uformattedvalue.h" +#include <_foundation_unicode/appendable.h> +#include <_foundation_unicode/fpositer.h> +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/uformattedvalue.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/include/unicode/fpositer.h b/icuSources/include/_foundation_unicode/fpositer.h similarity index 94% rename from icuSources/i18n/include/unicode/fpositer.h rename to icuSources/include/_foundation_unicode/fpositer.h index 0e38d0b..35517f5 100644 --- a/icuSources/i18n/include/unicode/fpositer.h +++ b/icuSources/include/_foundation_unicode/fpositer.h @@ -18,11 +18,11 @@ #ifndef FPOSITER_H #define FPOSITER_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API -#include "unicode/uobject.h" +#include <_foundation_unicode/uobject.h> /** * \file @@ -43,8 +43,8 @@ U_NAMESPACE_END #else -#include "unicode/fieldpos.h" -#include "unicode/umisc.h" +#include <_foundation_unicode/fieldpos.h> +#include <_foundation_unicode/umisc.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/include/unicode/gender.h b/icuSources/include/_foundation_unicode/gender.h similarity index 95% rename from icuSources/i18n/include/unicode/gender.h rename to icuSources/include/_foundation_unicode/gender.h index c81f7c8..e56f524 100644 --- a/icuSources/i18n/include/unicode/gender.h +++ b/icuSources/include/_foundation_unicode/gender.h @@ -23,15 +23,15 @@ * \brief C++ API: GenderInfo computes the gender of a list. */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API #if !UCONFIG_NO_FORMATTING -#include "unicode/locid.h" -#include "unicode/ugender.h" -#include "unicode/uobject.h" +#include <_foundation_unicode/locid.h> +#include <_foundation_unicode/ugender.h> +#include <_foundation_unicode/uobject.h> class GenderInfoTest; diff --git a/icuSources/i18n/include/unicode/gregocal.h b/icuSources/include/_foundation_unicode/gregocal.h similarity index 99% rename from icuSources/i18n/include/unicode/gregocal.h rename to icuSources/include/_foundation_unicode/gregocal.h index d97b33b..f549574 100644 --- a/icuSources/i18n/include/unicode/gregocal.h +++ b/icuSources/include/_foundation_unicode/gregocal.h @@ -26,13 +26,13 @@ #ifndef GREGOCAL_H #define GREGOCAL_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API #if !UCONFIG_NO_FORMATTING -#include "unicode/calendar.h" +#include <_foundation_unicode/calendar.h> /** * \file diff --git a/icuSources/common/include/unicode/icudataver.h b/icuSources/include/_foundation_unicode/icudataver.h similarity index 96% rename from icuSources/common/include/unicode/icudataver.h rename to icuSources/include/_foundation_unicode/icudataver.h index f218ed8..411eddc 100644 --- a/icuSources/common/include/unicode/icudataver.h +++ b/icuSources/include/_foundation_unicode/icudataver.h @@ -18,7 +18,7 @@ #ifndef __ICU_DATA_VER_H__ #define __ICU_DATA_VER_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> /** * @stable ICU 49 diff --git a/icuSources/common/include/unicode/icuplug.h b/icuSources/include/_foundation_unicode/icuplug.h similarity index 99% rename from icuSources/common/include/unicode/icuplug.h rename to icuSources/include/_foundation_unicode/icuplug.h index 205af36..cac9f6a 100644 --- a/icuSources/common/include/unicode/icuplug.h +++ b/icuSources/include/_foundation_unicode/icuplug.h @@ -107,7 +107,7 @@ #ifndef ICUPLUG_H #define ICUPLUG_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if UCONFIG_ENABLE_PLUGINS || defined(U_IN_DOXYGEN) diff --git a/icuSources/common/include/unicode/idna.h b/icuSources/include/_foundation_unicode/idna.h similarity index 98% rename from icuSources/common/include/unicode/idna.h rename to icuSources/include/_foundation_unicode/idna.h index 1c57205..30004a7 100644 --- a/icuSources/common/include/unicode/idna.h +++ b/icuSources/include/_foundation_unicode/idna.h @@ -22,16 +22,16 @@ * \brief C++ API: Internationalizing Domain Names in Applications (IDNA) */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API #if !UCONFIG_NO_IDNA -#include "unicode/bytestream.h" -#include "unicode/stringpiece.h" -#include "unicode/uidna.h" -#include "unicode/unistr.h" +#include <_foundation_unicode/bytestream.h> +#include <_foundation_unicode/stringpiece.h> +#include <_foundation_unicode/uidna.h> +#include <_foundation_unicode/unistr.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/include/unicode/listformatter.h b/icuSources/include/_foundation_unicode/listformatter.h similarity index 97% rename from icuSources/i18n/include/unicode/listformatter.h rename to icuSources/include/_foundation_unicode/listformatter.h index 25375da..ac614f3 100644 --- a/icuSources/i18n/include/unicode/listformatter.h +++ b/icuSources/include/_foundation_unicode/listformatter.h @@ -19,16 +19,16 @@ #ifndef __LISTFORMATTER_H__ #define __LISTFORMATTER_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API #if !UCONFIG_NO_FORMATTING -#include "unicode/unistr.h" -#include "unicode/locid.h" -#include "unicode/formattedvalue.h" -#include "unicode/ulistformatter.h" +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/locid.h> +#include <_foundation_unicode/formattedvalue.h> +#include <_foundation_unicode/ulistformatter.h> U_NAMESPACE_BEGIN diff --git a/icuSources/common/include/unicode/localebuilder.h b/icuSources/include/_foundation_unicode/localebuilder.h similarity index 98% rename from icuSources/common/include/unicode/localebuilder.h rename to icuSources/include/_foundation_unicode/localebuilder.h index f708a7e..a8e90b6 100644 --- a/icuSources/common/include/unicode/localebuilder.h +++ b/icuSources/include/_foundation_unicode/localebuilder.h @@ -3,14 +3,14 @@ #ifndef __LOCALEBUILDER_H__ #define __LOCALEBUILDER_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API -#include "unicode/locid.h" -#include "unicode/localematcher.h" -#include "unicode/stringpiece.h" -#include "unicode/uobject.h" +#include <_foundation_unicode/locid.h> +#include <_foundation_unicode/localematcher.h> +#include <_foundation_unicode/stringpiece.h> +#include <_foundation_unicode/uobject.h> /** * \file diff --git a/icuSources/common/include/unicode/localematcher.h b/icuSources/include/_foundation_unicode/localematcher.h similarity index 99% rename from icuSources/common/include/unicode/localematcher.h rename to icuSources/include/_foundation_unicode/localematcher.h index 0f7e04a..d265013 100644 --- a/icuSources/common/include/unicode/localematcher.h +++ b/icuSources/include/_foundation_unicode/localematcher.h @@ -7,13 +7,13 @@ #ifndef __LOCALEMATCHER_H__ #define __LOCALEMATCHER_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API -#include "unicode/locid.h" -#include "unicode/stringpiece.h" -#include "unicode/uobject.h" +#include <_foundation_unicode/locid.h> +#include <_foundation_unicode/stringpiece.h> +#include <_foundation_unicode/uobject.h> /** * \file diff --git a/icuSources/common/include/unicode/localpointer.h b/icuSources/include/_foundation_unicode/localpointer.h similarity index 99% rename from icuSources/common/include/unicode/localpointer.h rename to icuSources/include/_foundation_unicode/localpointer.h index 96c659d..d6e4fb3 100644 --- a/icuSources/common/include/unicode/localpointer.h +++ b/icuSources/include/_foundation_unicode/localpointer.h @@ -38,7 +38,7 @@ * For details see https://icu.unicode.org/design/cpp/scoped_ptr */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API diff --git a/icuSources/common/include/unicode/locdspnm.h b/icuSources/include/_foundation_unicode/locdspnm.h similarity index 96% rename from icuSources/common/include/unicode/locdspnm.h rename to icuSources/include/_foundation_unicode/locdspnm.h index 4f06f85..88943ac 100644 --- a/icuSources/common/include/unicode/locdspnm.h +++ b/icuSources/include/_foundation_unicode/locdspnm.h @@ -10,7 +10,7 @@ #ifndef LOCDSPNM_H #define LOCDSPNM_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API @@ -21,11 +21,11 @@ #if !UCONFIG_NO_FORMATTING -#include "unicode/locid.h" -#include "unicode/strenum.h" -#include "unicode/uscript.h" -#include "unicode/uldnames.h" -#include "unicode/udisplaycontext.h" +#include <_foundation_unicode/locid.h> +#include <_foundation_unicode/strenum.h> +#include <_foundation_unicode/uscript.h> +#include <_foundation_unicode/uldnames.h> +#include <_foundation_unicode/udisplaycontext.h> U_NAMESPACE_BEGIN diff --git a/icuSources/common/include/unicode/locid.h b/icuSources/include/_foundation_unicode/locid.h similarity index 99% rename from icuSources/common/include/unicode/locid.h rename to icuSources/include/_foundation_unicode/locid.h index 2f2b399..630f980 100644 --- a/icuSources/common/include/unicode/locid.h +++ b/icuSources/include/_foundation_unicode/locid.h @@ -31,17 +31,17 @@ #ifndef LOCID_H #define LOCID_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API -#include "unicode/bytestream.h" -#include "unicode/localpointer.h" -#include "unicode/strenum.h" -#include "unicode/stringpiece.h" -#include "unicode/uobject.h" -#include "unicode/putil.h" -#include "unicode/uloc.h" +#include <_foundation_unicode/bytestream.h> +#include <_foundation_unicode/localpointer.h> +#include <_foundation_unicode/strenum.h> +#include <_foundation_unicode/stringpiece.h> +#include <_foundation_unicode/uobject.h> +#include <_foundation_unicode/putil.h> +#include <_foundation_unicode/uloc.h> /** * \file diff --git a/icuSources/i18n/include/unicode/measfmt.h b/icuSources/include/_foundation_unicode/measfmt.h similarity index 98% rename from icuSources/i18n/include/unicode/measfmt.h rename to icuSources/include/_foundation_unicode/measfmt.h index 3f46291..1018405 100644 --- a/icuSources/i18n/include/unicode/measfmt.h +++ b/icuSources/include/_foundation_unicode/measfmt.h @@ -13,18 +13,18 @@ #ifndef MEASUREFORMAT_H #define MEASUREFORMAT_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API #if !UCONFIG_NO_FORMATTING -#include "unicode/format.h" -#include "unicode/udat.h" +#include <_foundation_unicode/format.h> +#include <_foundation_unicode/udat.h> #if APPLE_ICU_CHANGES // rdar:// // Apple specific: -#include "unicode/uameasureformat.h" +#include <_foundation_unicode/uameasureformat.h> #endif // APPLE_ICU_CHANGES /** diff --git a/icuSources/i18n/include/unicode/measunit.h b/icuSources/include/_foundation_unicode/measunit.h similarity index 99% rename from icuSources/i18n/include/unicode/measunit.h rename to icuSources/include/_foundation_unicode/measunit.h index 6a5a559..2b3300e 100644 --- a/icuSources/i18n/include/unicode/measunit.h +++ b/icuSources/include/_foundation_unicode/measunit.h @@ -13,17 +13,17 @@ #ifndef __MEASUREUNIT_H__ #define __MEASUREUNIT_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API #if !UCONFIG_NO_FORMATTING -#include "unicode/unistr.h" -#include "unicode/localpointer.h" +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/localpointer.h> #if APPLE_ICU_CHANGES // rdar:// -#include "unicode/uameasureunit.h" // Apple-specific +#include <_foundation_unicode/uameasureunit.h> // Apple-specific #endif // APPLE_ICU_CHANGES /** diff --git a/icuSources/i18n/include/unicode/measure.h b/icuSources/include/_foundation_unicode/measure.h similarity index 98% rename from icuSources/i18n/include/unicode/measure.h rename to icuSources/include/_foundation_unicode/measure.h index 7b118ac..e2c6717 100644 --- a/icuSources/i18n/include/unicode/measure.h +++ b/icuSources/include/_foundation_unicode/measure.h @@ -13,7 +13,7 @@ #ifndef __MEASURE_H__ #define __MEASURE_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API @@ -24,7 +24,7 @@ #if !UCONFIG_NO_FORMATTING -#include "unicode/fmtable.h" +#include <_foundation_unicode/fmtable.h> U_NAMESPACE_BEGIN diff --git a/icuSources/common/include/unicode/messagepattern.h b/icuSources/include/_foundation_unicode/messagepattern.h similarity index 99% rename from icuSources/common/include/unicode/messagepattern.h rename to icuSources/include/_foundation_unicode/messagepattern.h index 4c5be13..d38b347 100644 --- a/icuSources/common/include/unicode/messagepattern.h +++ b/icuSources/include/_foundation_unicode/messagepattern.h @@ -22,14 +22,14 @@ * \brief C++ API: MessagePattern class: Parses and represents ICU MessageFormat patterns. */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API #if !UCONFIG_NO_FORMATTING -#include "unicode/parseerr.h" -#include "unicode/unistr.h" +#include <_foundation_unicode/parseerr.h> +#include <_foundation_unicode/unistr.h> /** * Mode for when an apostrophe starts quoted literal text for MessageFormat output. diff --git a/icuSources/include/_foundation_unicode/module.modulemap b/icuSources/include/_foundation_unicode/module.modulemap new file mode 100644 index 0000000..6c69fe6 --- /dev/null +++ b/icuSources/include/_foundation_unicode/module.modulemap @@ -0,0 +1,204 @@ +module _FoundationICU { + header "appendable.h" + header "brkiter.h" + header "bytestream.h" + header "bytestrie.h" + header "bytestriebuilder.h" + header "caniter.h" + header "casemap.h" + header "char16ptr.h" + header "chariter.h" + header "dbbi.h" + header "docmain.h" + header "dtintrv.h" + header "edits.h" + header "enumset.h" + header "errorcode.h" + header "filteredbrk.h" + header "icudataver.h" + header "icuplug.h" + header "idna.h" + header "localebuilder.h" + header "localematcher.h" + header "localpointer.h" + header "locdspnm.h" + header "locid.h" + header "messagepattern.h" + header "normalizer2.h" + header "normlzr.h" + header "parseerr.h" + header "parsepos.h" + header "platform.h" + header "ptypes.h" + header "putil.h" + header "rbbi.h" + header "rep.h" + header "resbund.h" + header "schriter.h" + header "simpleformatter.h" + header "std_string.h" + header "strenum.h" + header "stringoptions.h" + header "stringpiece.h" + header "stringtriebuilder.h" + header "symtable.h" + header "ualoc.h" + header "ubidi.h" + header "ubiditransform.h" + header "ubrk.h" + header "ucasemap.h" + header "ucat.h" + header "uchar.h" + header "ucharstrie.h" + header "ucharstriebuilder.h" + header "uchriter.h" + header "uclean.h" + header "ucnv.h" + header "ucnv_cb.h" + header "ucnv_err.h" + header "ucnvsel.h" + header "uconfig.h" + header "ucpmap.h" + header "ucptrie.h" + header "ucurr.h" + header "udata.h" + header "udisplaycontext.h" + header "uenum.h" + header "uidna.h" + header "uiter.h" + header "uldnames.h" + header "uloc.h" + header "ulocdata.h" + header "umachine.h" + header "umisc.h" + header "umutablecptrie.h" + header "unifilt.h" + header "unifunct.h" + header "unimatch.h" + header "uniset.h" + header "unistr.h" + header "unorm.h" + header "unorm2.h" + header "uobject.h" + header "urbtok.h" + header "urename.h" + header "urep.h" + header "ures.h" + header "uscript.h" + header "uset.h" + header "usetiter.h" + header "ushape.h" + header "usprep.h" + header "ustring.h" + header "ustringtrie.h" + header "utext.h" + header "utf.h" + header "utf16.h" + header "utf32.h" + header "utf8.h" + header "utf_old.h" + header "utrace.h" + header "utypes.h" + header "uvernum.h" + header "uversion.h" + + header "alphaindex.h" + header "basictz.h" + header "calendar.h" + header "choicfmt.h" + header "coleitr.h" + header "coll.h" + header "compactdecimalformat.h" + header "curramt.h" + header "currpinf.h" + header "currunit.h" + header "datefmt.h" + header "dcfmtsym.h" + header "decimfmt.h" + header "displayoptions.h" + header "dtfmtsym.h" + header "dtitvfmt.h" + header "dtitvinf.h" + header "dtptngen.h" + header "dtrule.h" + header "fieldpos.h" + header "fmtable.h" + header "format.h" + header "formattedvalue.h" + header "fpositer.h" + header "gender.h" + header "gregocal.h" + header "listformatter.h" + header "measfmt.h" + header "measunit.h" + header "measure.h" + header "msgfmt.h" + header "nounit.h" + header "numberformatter.h" + header "numberrangeformatter.h" + header "numfmt.h" + header "numsys.h" + header "plurfmt.h" + header "plurrule.h" + header "rbnf.h" + header "rbtz.h" + header "regex.h" + header "region.h" + header "reldatefmt.h" + header "scientificnumberformatter.h" + header "search.h" + header "selfmt.h" + header "simpletz.h" + header "smpdtfmt.h" + header "sortkey.h" + header "stsearch.h" + header "tblcoll.h" + header "timezone.h" + header "tmunit.h" + header "tmutamt.h" + header "tmutfmt.h" + header "translit.h" + header "tzfmt.h" + header "tznames.h" + header "tzrule.h" + header "tztrans.h" + header "uameasureformat.h" + header "uameasureunit.h" + header "uatimeunitformat.h" + header "ucal.h" + header "ucol.h" + header "ucoleitr.h" + header "ucsdet.h" + header "udat.h" + header "udateintervalformat.h" + header "udatintv.h" + header "udatpg.h" + header "udisplayoptions.h" + header "ufieldpositer.h" + header "uformattable.h" + header "uformattedvalue.h" + header "ugender.h" + header "ulistformatter.h" + header "umsg.h" + header "unirepl.h" + header "unum.h" + header "unumberformatter.h" + header "unumberrangeformatter.h" + header "unumsys.h" + header "uplrule.h" + header "upluralrules.h" + header "uregex.h" + header "uregion.h" + header "ureldatefmt.h" + header "usearch.h" + header "uspoof.h" + header "utmscale.h" + header "utrans.h" + header "vtzone.h" + + header "ustdio.h" + header "ustream.h" + + export * +} + diff --git a/icuSources/i18n/include/unicode/msgfmt.h b/icuSources/include/_foundation_unicode/msgfmt.h similarity index 99% rename from icuSources/i18n/include/unicode/msgfmt.h rename to icuSources/include/_foundation_unicode/msgfmt.h index 76e1ab7..9c9ced7 100644 --- a/icuSources/i18n/include/unicode/msgfmt.h +++ b/icuSources/include/_foundation_unicode/msgfmt.h @@ -19,7 +19,7 @@ #ifndef MSGFMT_H #define MSGFMT_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API @@ -30,12 +30,12 @@ #if !UCONFIG_NO_FORMATTING -#include "unicode/format.h" -#include "unicode/locid.h" -#include "unicode/messagepattern.h" -#include "unicode/parseerr.h" -#include "unicode/plurfmt.h" -#include "unicode/plurrule.h" +#include <_foundation_unicode/format.h> +#include <_foundation_unicode/locid.h> +#include <_foundation_unicode/messagepattern.h> +#include <_foundation_unicode/parseerr.h> +#include <_foundation_unicode/plurfmt.h> +#include <_foundation_unicode/plurrule.h> U_CDECL_BEGIN // Forward declaration. diff --git a/icuSources/common/include/unicode/normalizer2.h b/icuSources/include/_foundation_unicode/normalizer2.h similarity index 99% rename from icuSources/common/include/unicode/normalizer2.h rename to icuSources/include/_foundation_unicode/normalizer2.h index 2d35525..7a8ac5f 100644 --- a/icuSources/common/include/unicode/normalizer2.h +++ b/icuSources/include/_foundation_unicode/normalizer2.h @@ -24,16 +24,16 @@ * \brief C++ API: New API for Unicode Normalization. */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API #if !UCONFIG_NO_NORMALIZATION -#include "unicode/stringpiece.h" -#include "unicode/uniset.h" -#include "unicode/unistr.h" -#include "unicode/unorm2.h" +#include <_foundation_unicode/stringpiece.h> +#include <_foundation_unicode/uniset.h> +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/unorm2.h> U_NAMESPACE_BEGIN diff --git a/icuSources/common/include/unicode/normlzr.h b/icuSources/include/_foundation_unicode/normlzr.h similarity index 99% rename from icuSources/common/include/unicode/normlzr.h rename to icuSources/include/_foundation_unicode/normlzr.h index 14b2469..5719b8e 100644 --- a/icuSources/common/include/unicode/normlzr.h +++ b/icuSources/include/_foundation_unicode/normlzr.h @@ -11,7 +11,7 @@ #ifndef NORMLZR_H #define NORMLZR_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API @@ -22,11 +22,11 @@ #if !UCONFIG_NO_NORMALIZATION -#include "unicode/chariter.h" -#include "unicode/normalizer2.h" -#include "unicode/unistr.h" -#include "unicode/unorm.h" -#include "unicode/uobject.h" +#include <_foundation_unicode/chariter.h> +#include <_foundation_unicode/normalizer2.h> +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/unorm.h> +#include <_foundation_unicode/uobject.h> U_NAMESPACE_BEGIN /** diff --git a/icuSources/i18n/include/unicode/nounit.h b/icuSources/include/_foundation_unicode/nounit.h similarity index 96% rename from icuSources/i18n/include/unicode/nounit.h rename to icuSources/include/_foundation_unicode/nounit.h index 96aca35..63d6e07 100644 --- a/icuSources/i18n/include/unicode/nounit.h +++ b/icuSources/include/_foundation_unicode/nounit.h @@ -10,13 +10,13 @@ #ifndef __NOUNIT_H__ #define __NOUNIT_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API #if !UCONFIG_NO_FORMATTING -#include "unicode/measunit.h" +#include <_foundation_unicode/measunit.h> /** * \file diff --git a/icuSources/i18n/include/unicode/numberformatter.h b/icuSources/include/_foundation_unicode/numberformatter.h similarity index 99% rename from icuSources/i18n/include/unicode/numberformatter.h rename to icuSources/include/_foundation_unicode/numberformatter.h index 531fe8c..ec3a204 100644 --- a/icuSources/i18n/include/unicode/numberformatter.h +++ b/icuSources/include/_foundation_unicode/numberformatter.h @@ -4,29 +4,29 @@ #ifndef __NUMBERFORMATTER_H__ #define __NUMBERFORMATTER_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API #if !UCONFIG_NO_FORMATTING -#include "unicode/appendable.h" -#include "unicode/bytestream.h" -#include "unicode/currunit.h" -#include "unicode/dcfmtsym.h" -#include "unicode/displayoptions.h" -#include "unicode/fieldpos.h" -#include "unicode/formattedvalue.h" -#include "unicode/fpositer.h" -#include "unicode/measunit.h" -#include "unicode/nounit.h" -#include "unicode/parseerr.h" -#include "unicode/plurrule.h" -#include "unicode/ucurr.h" -#include "unicode/udisplayoptions.h" -#include "unicode/unum.h" -#include "unicode/unumberformatter.h" -#include "unicode/uobject.h" +#include <_foundation_unicode/appendable.h> +#include <_foundation_unicode/bytestream.h> +#include <_foundation_unicode/currunit.h> +#include <_foundation_unicode/dcfmtsym.h> +#include <_foundation_unicode/displayoptions.h> +#include <_foundation_unicode/fieldpos.h> +#include <_foundation_unicode/formattedvalue.h> +#include <_foundation_unicode/fpositer.h> +#include <_foundation_unicode/measunit.h> +#include <_foundation_unicode/nounit.h> +#include <_foundation_unicode/parseerr.h> +#include <_foundation_unicode/plurrule.h> +#include <_foundation_unicode/ucurr.h> +#include <_foundation_unicode/udisplayoptions.h> +#include <_foundation_unicode/unum.h> +#include <_foundation_unicode/unumberformatter.h> +#include <_foundation_unicode/uobject.h> /** * \file diff --git a/icuSources/i18n/include/unicode/numberrangeformatter.h b/icuSources/include/_foundation_unicode/numberrangeformatter.h similarity index 98% rename from icuSources/i18n/include/unicode/numberrangeformatter.h rename to icuSources/include/_foundation_unicode/numberrangeformatter.h index 7f53595..420ae41 100644 --- a/icuSources/i18n/include/unicode/numberrangeformatter.h +++ b/icuSources/include/_foundation_unicode/numberrangeformatter.h @@ -4,19 +4,19 @@ #ifndef __NUMBERRANGEFORMATTER_H__ #define __NUMBERRANGEFORMATTER_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API #if !UCONFIG_NO_FORMATTING #include -#include "unicode/appendable.h" -#include "unicode/fieldpos.h" -#include "unicode/formattedvalue.h" -#include "unicode/fpositer.h" -#include "unicode/numberformatter.h" -#include "unicode/unumberrangeformatter.h" +#include <_foundation_unicode/appendable.h> +#include <_foundation_unicode/fieldpos.h> +#include <_foundation_unicode/formattedvalue.h> +#include <_foundation_unicode/fpositer.h> +#include <_foundation_unicode/numberformatter.h> +#include <_foundation_unicode/unumberrangeformatter.h> /** * \file diff --git a/icuSources/i18n/include/unicode/numfmt.h b/icuSources/include/_foundation_unicode/numfmt.h similarity index 98% rename from icuSources/i18n/include/unicode/numfmt.h rename to icuSources/include/_foundation_unicode/numfmt.h index aa96029..376e0cb 100644 --- a/icuSources/i18n/include/unicode/numfmt.h +++ b/icuSources/include/_foundation_unicode/numfmt.h @@ -24,7 +24,7 @@ #define NUMFMT_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API @@ -35,13 +35,13 @@ #if !UCONFIG_NO_FORMATTING -#include "unicode/unistr.h" -#include "unicode/format.h" -#include "unicode/unum.h" // UNumberFormatStyle -#include "unicode/locid.h" -#include "unicode/stringpiece.h" -#include "unicode/curramt.h" -#include "unicode/udisplaycontext.h" +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/format.h> +#include <_foundation_unicode/unum.h> // UNumberFormatStyle +#include <_foundation_unicode/locid.h> +#include <_foundation_unicode/stringpiece.h> +#include <_foundation_unicode/curramt.h> +#include <_foundation_unicode/udisplaycontext.h> class NumberFormatTest; @@ -64,7 +64,7 @@ class StringEnumeration; * determining which locales have number formats, and what their names * are. * - * \headerfile unicode/numfmt.h "unicode/numfmt.h" + * \headerfile _foundation_unicode/numfmt.h "unicode/numfmt.h" *

* NumberFormat helps you to format and parse numbers for any locale. * Your code can be completely independent of the locale conventions @@ -75,9 +75,9 @@ class StringEnumeration; * factory methods: * \code * #include - * #include "unicode/numfmt.h" - * #include "unicode/unistr.h" - * #include "unicode/ustream.h" + * #include <_foundation_unicode/numfmt.h> + * #include <_foundation_unicode/unistr.h> + * #include <_foundation_unicode/ustream.h> * using namespace std; * * int main() { diff --git a/icuSources/i18n/include/unicode/numsys.h b/icuSources/include/_foundation_unicode/numsys.h similarity index 98% rename from icuSources/i18n/include/unicode/numsys.h rename to icuSources/include/_foundation_unicode/numsys.h index 358dc53..a33073f 100644 --- a/icuSources/i18n/include/unicode/numsys.h +++ b/icuSources/include/_foundation_unicode/numsys.h @@ -18,7 +18,7 @@ #ifndef NUMSYS #define NUMSYS -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API @@ -29,8 +29,8 @@ #if !UCONFIG_NO_FORMATTING -#include "unicode/format.h" -#include "unicode/uobject.h" +#include <_foundation_unicode/format.h> +#include <_foundation_unicode/uobject.h> U_NAMESPACE_BEGIN diff --git a/icuSources/common/include/unicode/parseerr.h b/icuSources/include/_foundation_unicode/parseerr.h similarity index 98% rename from icuSources/common/include/unicode/parseerr.h rename to icuSources/include/_foundation_unicode/parseerr.h index c23cc27..69aaac9 100644 --- a/icuSources/common/include/unicode/parseerr.h +++ b/icuSources/include/_foundation_unicode/parseerr.h @@ -13,7 +13,7 @@ #ifndef PARSEERR_H #define PARSEERR_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> /** diff --git a/icuSources/common/include/unicode/parsepos.h b/icuSources/include/_foundation_unicode/parsepos.h similarity index 98% rename from icuSources/common/include/unicode/parsepos.h rename to icuSources/include/_foundation_unicode/parsepos.h index 73945f5..eb0df8e 100644 --- a/icuSources/common/include/unicode/parsepos.h +++ b/icuSources/include/_foundation_unicode/parsepos.h @@ -18,11 +18,11 @@ #ifndef PARSEPOS_H #define PARSEPOS_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API -#include "unicode/uobject.h" +#include <_foundation_unicode/uobject.h> U_NAMESPACE_BEGIN diff --git a/icuSources/common/include/unicode/platform.h b/icuSources/include/_foundation_unicode/platform.h similarity index 99% rename from icuSources/common/include/unicode/platform.h rename to icuSources/include/_foundation_unicode/platform.h index 1605226..18c60c0 100644 --- a/icuSources/common/include/unicode/platform.h +++ b/icuSources/include/_foundation_unicode/platform.h @@ -21,8 +21,8 @@ #ifndef _PLATFORM_H #define _PLATFORM_H -#include "unicode/uconfig.h" -#include "unicode/uvernum.h" +#include <_foundation_unicode/uconfig.h> +#include <_foundation_unicode/uvernum.h> /** * \file @@ -639,7 +639,7 @@ namespace std { * - ucnv_setDefaultName() is disabled and will not change the default charset * - static builds of ICU are smaller * - more functionality is available with the UCONFIG_NO_CONVERSION build-time - * configuration option (see unicode/uconfig.h) + * configuration option (see _foundation_unicode/uconfig.h) * - the UCONFIG_NO_CONVERSION build option in uconfig.h is more usable * * @stable ICU 4.2 diff --git a/icuSources/i18n/include/unicode/plurfmt.h b/icuSources/include/_foundation_unicode/plurfmt.h similarity index 99% rename from icuSources/i18n/include/unicode/plurfmt.h rename to icuSources/include/_foundation_unicode/plurfmt.h index 1bdc369..4b9e33a 100644 --- a/icuSources/i18n/include/unicode/plurfmt.h +++ b/icuSources/include/_foundation_unicode/plurfmt.h @@ -14,7 +14,7 @@ #ifndef PLURFMT #define PLURFMT -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API @@ -25,9 +25,9 @@ #if !UCONFIG_NO_FORMATTING -#include "unicode/messagepattern.h" -#include "unicode/numfmt.h" -#include "unicode/plurrule.h" +#include <_foundation_unicode/messagepattern.h> +#include <_foundation_unicode/numfmt.h> +#include <_foundation_unicode/plurrule.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/include/unicode/plurrule.h b/icuSources/include/_foundation_unicode/plurrule.h similarity index 99% rename from icuSources/i18n/include/unicode/plurrule.h rename to icuSources/include/_foundation_unicode/plurrule.h index b4298de..275e673 100644 --- a/icuSources/i18n/include/unicode/plurrule.h +++ b/icuSources/include/_foundation_unicode/plurrule.h @@ -18,7 +18,7 @@ #ifndef PLURRULE #define PLURRULE -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API @@ -29,10 +29,10 @@ #if !UCONFIG_NO_FORMATTING -#include "unicode/format.h" -#include "unicode/upluralrules.h" +#include <_foundation_unicode/format.h> +#include <_foundation_unicode/upluralrules.h> #ifndef U_HIDE_INTERNAL_API -#include "unicode/numfmt.h" +#include <_foundation_unicode/numfmt.h> #endif /* U_HIDE_INTERNAL_API */ /** diff --git a/icuSources/common/include/unicode/ptypes.h b/icuSources/include/_foundation_unicode/ptypes.h similarity index 98% rename from icuSources/common/include/unicode/ptypes.h rename to icuSources/include/_foundation_unicode/ptypes.h index 70324ff..75d18ab 100644 --- a/icuSources/common/include/unicode/ptypes.h +++ b/icuSources/include/_foundation_unicode/ptypes.h @@ -49,7 +49,7 @@ */ /* Find out if we have stdint.h etc. */ -#include "unicode/platform.h" +#include <_foundation_unicode/platform.h> /*===========================================================================*/ /* Generic data types */ diff --git a/icuSources/common/include/unicode/putil.h b/icuSources/include/_foundation_unicode/putil.h similarity index 99% rename from icuSources/common/include/unicode/putil.h rename to icuSources/include/_foundation_unicode/putil.h index 500c212..5853d59 100644 --- a/icuSources/common/include/unicode/putil.h +++ b/icuSources/include/_foundation_unicode/putil.h @@ -26,7 +26,7 @@ #ifndef PUTIL_H #define PUTIL_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> /** * \file * \brief C API: Platform Utilities diff --git a/icuSources/common/include/unicode/rbbi.h b/icuSources/include/_foundation_unicode/rbbi.h similarity index 99% rename from icuSources/common/include/unicode/rbbi.h rename to icuSources/include/_foundation_unicode/rbbi.h index 00ac52e..67709d9 100644 --- a/icuSources/common/include/unicode/rbbi.h +++ b/icuSources/include/_foundation_unicode/rbbi.h @@ -16,7 +16,7 @@ #ifndef RBBI_H #define RBBI_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API @@ -27,13 +27,13 @@ #if !UCONFIG_NO_BREAK_ITERATION -#include "unicode/brkiter.h" -#include "unicode/udata.h" -#include "unicode/parseerr.h" -#include "unicode/schriter.h" +#include <_foundation_unicode/brkiter.h> +#include <_foundation_unicode/udata.h> +#include <_foundation_unicode/parseerr.h> +#include <_foundation_unicode/schriter.h> #if APPLE_ICU_CHANGES // rdar://35946337 (Rewrite urbtok_tokenize & other urbtok_ interfaces to work with new RBBI but be fast enough) -#include "unicode/urbtok.h" +#include <_foundation_unicode/urbtok.h> #endif // APPLE_ICU_CHANGES struct UCPTrie; diff --git a/icuSources/i18n/include/unicode/rbnf.h b/icuSources/include/_foundation_unicode/rbnf.h similarity index 99% rename from icuSources/i18n/include/unicode/rbnf.h rename to icuSources/include/_foundation_unicode/rbnf.h index 70d92dd..5367a78 100644 --- a/icuSources/i18n/include/unicode/rbnf.h +++ b/icuSources/include/_foundation_unicode/rbnf.h @@ -10,7 +10,7 @@ #ifndef RBNF_H #define RBNF_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API @@ -31,14 +31,14 @@ #else #define U_HAVE_RBNF 1 -#include "unicode/dcfmtsym.h" -#include "unicode/fmtable.h" -#include "unicode/locid.h" -#include "unicode/numfmt.h" -#include "unicode/unistr.h" -#include "unicode/strenum.h" -#include "unicode/brkiter.h" -#include "unicode/upluralrules.h" +#include <_foundation_unicode/dcfmtsym.h> +#include <_foundation_unicode/fmtable.h> +#include <_foundation_unicode/locid.h> +#include <_foundation_unicode/numfmt.h> +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/strenum.h> +#include <_foundation_unicode/brkiter.h> +#include <_foundation_unicode/upluralrules.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/include/unicode/rbtz.h b/icuSources/include/_foundation_unicode/rbtz.h similarity index 99% rename from icuSources/i18n/include/unicode/rbtz.h rename to icuSources/include/_foundation_unicode/rbtz.h index 4fbf330..ee078f3 100644 --- a/icuSources/i18n/include/unicode/rbtz.h +++ b/icuSources/include/_foundation_unicode/rbtz.h @@ -9,7 +9,7 @@ #ifndef RBTZ_H #define RBTZ_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API @@ -20,8 +20,8 @@ #if !UCONFIG_NO_FORMATTING -#include "unicode/basictz.h" -#include "unicode/unistr.h" +#include <_foundation_unicode/basictz.h> +#include <_foundation_unicode/unistr.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/include/unicode/regex.h b/icuSources/include/_foundation_unicode/regex.h similarity index 99% rename from icuSources/i18n/include/unicode/regex.h rename to icuSources/include/_foundation_unicode/regex.h index 39b9744..d75617d 100644 --- a/icuSources/i18n/include/unicode/regex.h +++ b/icuSources/include/_foundation_unicode/regex.h @@ -42,18 +42,18 @@ * */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API #if !UCONFIG_NO_REGULAR_EXPRESSIONS -#include "unicode/uobject.h" -#include "unicode/unistr.h" -#include "unicode/utext.h" -#include "unicode/parseerr.h" +#include <_foundation_unicode/uobject.h> +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/utext.h> +#include <_foundation_unicode/parseerr.h> -#include "unicode/uregex.h" +#include <_foundation_unicode/uregex.h> // Forward Declarations diff --git a/icuSources/i18n/include/unicode/region.h b/icuSources/include/_foundation_unicode/region.h similarity index 97% rename from icuSources/i18n/include/unicode/region.h rename to icuSources/include/_foundation_unicode/region.h index ba4a650..5003115 100644 --- a/icuSources/i18n/include/unicode/region.h +++ b/icuSources/include/_foundation_unicode/region.h @@ -15,17 +15,17 @@ * \brief C++ API: Region classes (territory containment) */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API #if !UCONFIG_NO_FORMATTING -#include "unicode/uregion.h" -#include "unicode/uobject.h" -#include "unicode/uniset.h" -#include "unicode/unistr.h" -#include "unicode/strenum.h" +#include <_foundation_unicode/uregion.h> +#include <_foundation_unicode/uobject.h> +#include <_foundation_unicode/uniset.h> +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/strenum.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/include/unicode/reldatefmt.h b/icuSources/include/_foundation_unicode/reldatefmt.h similarity index 98% rename from icuSources/i18n/include/unicode/reldatefmt.h rename to icuSources/include/_foundation_unicode/reldatefmt.h index 2a3742f..5ffdf4c 100644 --- a/icuSources/i18n/include/unicode/reldatefmt.h +++ b/icuSources/include/_foundation_unicode/reldatefmt.h @@ -14,15 +14,15 @@ #ifndef __RELDATEFMT_H #define __RELDATEFMT_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API -#include "unicode/uobject.h" -#include "unicode/udisplaycontext.h" -#include "unicode/ureldatefmt.h" -#include "unicode/locid.h" -#include "unicode/formattedvalue.h" +#include <_foundation_unicode/uobject.h> +#include <_foundation_unicode/udisplaycontext.h> +#include <_foundation_unicode/ureldatefmt.h> +#include <_foundation_unicode/locid.h> +#include <_foundation_unicode/formattedvalue.h> /** * \file diff --git a/icuSources/common/include/unicode/rep.h b/icuSources/include/_foundation_unicode/rep.h similarity index 99% rename from icuSources/common/include/unicode/rep.h rename to icuSources/include/_foundation_unicode/rep.h index 6dd4530..7df333c 100644 --- a/icuSources/common/include/unicode/rep.h +++ b/icuSources/include/_foundation_unicode/rep.h @@ -16,11 +16,11 @@ #ifndef REP_H #define REP_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API -#include "unicode/uobject.h" +#include <_foundation_unicode/uobject.h> /** * \file diff --git a/icuSources/common/include/unicode/resbund.h b/icuSources/include/_foundation_unicode/resbund.h similarity index 98% rename from icuSources/common/include/unicode/resbund.h rename to icuSources/include/_foundation_unicode/resbund.h index 6e26a40..8bd4e55 100644 --- a/icuSources/common/include/unicode/resbund.h +++ b/icuSources/include/_foundation_unicode/resbund.h @@ -48,14 +48,14 @@ #ifndef RESBUND_H #define RESBUND_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API -#include "unicode/uobject.h" -#include "unicode/ures.h" -#include "unicode/unistr.h" -#include "unicode/locid.h" +#include <_foundation_unicode/uobject.h> +#include <_foundation_unicode/ures.h> +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/locid.h> /** * \file diff --git a/icuSources/common/include/unicode/schriter.h b/icuSources/include/_foundation_unicode/schriter.h similarity index 98% rename from icuSources/common/include/unicode/schriter.h rename to icuSources/include/_foundation_unicode/schriter.h index a2ab179..9cf52cf 100644 --- a/icuSources/common/include/unicode/schriter.h +++ b/icuSources/include/_foundation_unicode/schriter.h @@ -20,12 +20,12 @@ #ifndef SCHRITER_H #define SCHRITER_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API -#include "unicode/chariter.h" -#include "unicode/uchriter.h" +#include <_foundation_unicode/chariter.h> +#include <_foundation_unicode/uchriter.h> /** * \file diff --git a/icuSources/i18n/include/unicode/scientificnumberformatter.h b/icuSources/include/_foundation_unicode/scientificnumberformatter.h similarity index 98% rename from icuSources/i18n/include/unicode/scientificnumberformatter.h rename to icuSources/include/_foundation_unicode/scientificnumberformatter.h index a1dd543..bf91369 100644 --- a/icuSources/i18n/include/unicode/scientificnumberformatter.h +++ b/icuSources/include/_foundation_unicode/scientificnumberformatter.h @@ -9,14 +9,14 @@ #ifndef SCINUMBERFORMATTER_H #define SCINUMBERFORMATTER_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API #if !UCONFIG_NO_FORMATTING -#include "unicode/unistr.h" +#include <_foundation_unicode/unistr.h> /** * \file diff --git a/icuSources/i18n/include/unicode/search.h b/icuSources/include/_foundation_unicode/search.h similarity index 98% rename from icuSources/i18n/include/unicode/search.h rename to icuSources/include/_foundation_unicode/search.h index 295a3ce..f4a979a 100644 --- a/icuSources/i18n/include/unicode/search.h +++ b/icuSources/include/_foundation_unicode/search.h @@ -12,7 +12,7 @@ #ifndef SEARCH_H #define SEARCH_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API @@ -23,11 +23,11 @@ #if !UCONFIG_NO_COLLATION && !UCONFIG_NO_BREAK_ITERATION -#include "unicode/uobject.h" -#include "unicode/unistr.h" -#include "unicode/chariter.h" -#include "unicode/brkiter.h" -#include "unicode/usearch.h" +#include <_foundation_unicode/uobject.h> +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/chariter.h> +#include <_foundation_unicode/brkiter.h> +#include <_foundation_unicode/usearch.h> /** * @stable ICU 2.0 diff --git a/icuSources/i18n/include/unicode/selfmt.h b/icuSources/include/_foundation_unicode/selfmt.h similarity index 99% rename from icuSources/i18n/include/unicode/selfmt.h rename to icuSources/include/_foundation_unicode/selfmt.h index 1802380..2a56c04 100644 --- a/icuSources/i18n/include/unicode/selfmt.h +++ b/icuSources/include/_foundation_unicode/selfmt.h @@ -18,12 +18,12 @@ #ifndef SELFMT #define SELFMT -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API -#include "unicode/messagepattern.h" -#include "unicode/numfmt.h" +#include <_foundation_unicode/messagepattern.h> +#include <_foundation_unicode/numfmt.h> /** * \file diff --git a/icuSources/common/include/unicode/simpleformatter.h b/icuSources/include/_foundation_unicode/simpleformatter.h similarity index 99% rename from icuSources/common/include/unicode/simpleformatter.h rename to icuSources/include/_foundation_unicode/simpleformatter.h index 2ae3507..2ec2bb6 100644 --- a/icuSources/common/include/unicode/simpleformatter.h +++ b/icuSources/include/_foundation_unicode/simpleformatter.h @@ -16,11 +16,11 @@ * \brief C++ API: Simple formatter, minimal subset of MessageFormat. */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API -#include "unicode/unistr.h" +#include <_foundation_unicode/unistr.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/include/unicode/simpletz.h b/icuSources/include/_foundation_unicode/simpletz.h similarity index 99% rename from icuSources/i18n/include/unicode/simpletz.h rename to icuSources/include/_foundation_unicode/simpletz.h index cbdba7a..52e9252 100644 --- a/icuSources/i18n/include/unicode/simpletz.h +++ b/icuSources/include/_foundation_unicode/simpletz.h @@ -26,7 +26,7 @@ #ifndef SIMPLETZ_H #define SIMPLETZ_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API @@ -37,7 +37,7 @@ #if !UCONFIG_NO_FORMATTING -#include "unicode/basictz.h" +#include <_foundation_unicode/basictz.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/include/unicode/smpdtfmt.h b/icuSources/include/_foundation_unicode/smpdtfmt.h similarity index 99% rename from icuSources/i18n/include/unicode/smpdtfmt.h rename to icuSources/include/_foundation_unicode/smpdtfmt.h index 8b26f24..762789d 100644 --- a/icuSources/i18n/include/unicode/smpdtfmt.h +++ b/icuSources/include/_foundation_unicode/smpdtfmt.h @@ -26,7 +26,7 @@ #ifndef SMPDTFMT_H #define SMPDTFMT_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API @@ -37,10 +37,10 @@ #if !UCONFIG_NO_FORMATTING -#include "unicode/datefmt.h" -#include "unicode/udisplaycontext.h" -#include "unicode/tzfmt.h" /* for UTimeZoneFormatTimeType */ -#include "unicode/brkiter.h" +#include <_foundation_unicode/datefmt.h> +#include <_foundation_unicode/udisplaycontext.h> +#include <_foundation_unicode/tzfmt.h> /* for UTimeZoneFormatTimeType */ +#include <_foundation_unicode/brkiter.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/include/unicode/sortkey.h b/icuSources/include/_foundation_unicode/sortkey.h similarity index 98% rename from icuSources/i18n/include/unicode/sortkey.h rename to icuSources/include/_foundation_unicode/sortkey.h index b1231f1..0505ae9 100644 --- a/icuSources/i18n/include/unicode/sortkey.h +++ b/icuSources/include/_foundation_unicode/sortkey.h @@ -23,7 +23,7 @@ #ifndef SORTKEY_H #define SORTKEY_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API @@ -34,9 +34,9 @@ #if !UCONFIG_NO_COLLATION -#include "unicode/uobject.h" -#include "unicode/unistr.h" -#include "unicode/coll.h" +#include <_foundation_unicode/uobject.h> +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/coll.h> U_NAMESPACE_BEGIN diff --git a/icuSources/common/include/unicode/std_string.h b/icuSources/include/_foundation_unicode/std_string.h similarity index 96% rename from icuSources/common/include/unicode/std_string.h rename to icuSources/include/_foundation_unicode/std_string.h index bf87230..a90fc58 100644 --- a/icuSources/common/include/unicode/std_string.h +++ b/icuSources/include/_foundation_unicode/std_string.h @@ -25,7 +25,7 @@ * header and for related definitions. */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API diff --git a/icuSources/common/include/unicode/strenum.h b/icuSources/include/_foundation_unicode/strenum.h similarity index 98% rename from icuSources/common/include/unicode/strenum.h rename to icuSources/include/_foundation_unicode/strenum.h index 1d1b379..4229017 100644 --- a/icuSources/common/include/unicode/strenum.h +++ b/icuSources/include/_foundation_unicode/strenum.h @@ -12,12 +12,12 @@ #ifndef STRENUM_H #define STRENUM_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API -#include "unicode/uobject.h" -#include "unicode/unistr.h" +#include <_foundation_unicode/uobject.h> +#include <_foundation_unicode/unistr.h> /** * \file diff --git a/icuSources/common/include/unicode/stringoptions.h b/icuSources/include/_foundation_unicode/stringoptions.h similarity index 98% rename from icuSources/common/include/unicode/stringoptions.h rename to icuSources/include/_foundation_unicode/stringoptions.h index 7b9f709..5f098f7 100644 --- a/icuSources/common/include/unicode/stringoptions.h +++ b/icuSources/include/_foundation_unicode/stringoptions.h @@ -7,7 +7,7 @@ #ifndef __STRINGOPTIONS_H__ #define __STRINGOPTIONS_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> /** * \file @@ -177,7 +177,7 @@ // can share the same bits. // // Public: -// unicode/unorm.h #define UNORM_COMPARE_NORM_OPTIONS_SHIFT 20 +// _foundation_unicode/unorm.h #define UNORM_COMPARE_NORM_OPTIONS_SHIFT 20 // // Internal: (may change or be removed) // ucase.h #define _STRCASECMP_OPTIONS_MASK 0xffff diff --git a/icuSources/common/include/unicode/stringpiece.h b/icuSources/include/_foundation_unicode/stringpiece.h similarity index 98% rename from icuSources/common/include/unicode/stringpiece.h rename to icuSources/include/_foundation_unicode/stringpiece.h index df7f360..9ac20a8 100644 --- a/icuSources/common/include/unicode/stringpiece.h +++ b/icuSources/include/_foundation_unicode/stringpiece.h @@ -27,15 +27,15 @@ * \brief C++ API: StringPiece: Read-only byte string wrapper class. */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API #include #include -#include "unicode/uobject.h" -#include "unicode/std_string.h" +#include <_foundation_unicode/uobject.h> +#include <_foundation_unicode/std_string.h> // Arghh! I wish C++ literals were "string". diff --git a/icuSources/common/include/unicode/stringtriebuilder.h b/icuSources/include/_foundation_unicode/stringtriebuilder.h similarity index 99% rename from icuSources/common/include/unicode/stringtriebuilder.h rename to icuSources/include/_foundation_unicode/stringtriebuilder.h index b7a9b23..75d7b8d 100644 --- a/icuSources/common/include/unicode/stringtriebuilder.h +++ b/icuSources/include/_foundation_unicode/stringtriebuilder.h @@ -17,11 +17,11 @@ #ifndef __STRINGTRIEBUILDER_H__ #define __STRINGTRIEBUILDER_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API -#include "unicode/uobject.h" +#include <_foundation_unicode/uobject.h> /** * \file diff --git a/icuSources/i18n/include/unicode/stsearch.h b/icuSources/include/_foundation_unicode/stsearch.h similarity index 99% rename from icuSources/i18n/include/unicode/stsearch.h rename to icuSources/include/_foundation_unicode/stsearch.h index b8a919f..82021ed 100644 --- a/icuSources/i18n/include/unicode/stsearch.h +++ b/icuSources/include/_foundation_unicode/stsearch.h @@ -12,7 +12,7 @@ #ifndef STSEARCH_H #define STSEARCH_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API @@ -23,9 +23,9 @@ #if !UCONFIG_NO_COLLATION && !UCONFIG_NO_BREAK_ITERATION -#include "unicode/tblcoll.h" -#include "unicode/coleitr.h" -#include "unicode/search.h" +#include <_foundation_unicode/tblcoll.h> +#include <_foundation_unicode/coleitr.h> +#include <_foundation_unicode/search.h> U_NAMESPACE_BEGIN diff --git a/icuSources/common/include/unicode/symtable.h b/icuSources/include/_foundation_unicode/symtable.h similarity index 98% rename from icuSources/common/include/unicode/symtable.h rename to icuSources/include/_foundation_unicode/symtable.h index b64d877..528d36a 100644 --- a/icuSources/common/include/unicode/symtable.h +++ b/icuSources/include/_foundation_unicode/symtable.h @@ -12,11 +12,11 @@ #ifndef SYMTABLE_H #define SYMTABLE_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API -#include "unicode/uobject.h" +#include <_foundation_unicode/uobject.h> /** * \file diff --git a/icuSources/i18n/include/unicode/tblcoll.h b/icuSources/include/_foundation_unicode/tblcoll.h similarity index 99% rename from icuSources/i18n/include/unicode/tblcoll.h rename to icuSources/include/_foundation_unicode/tblcoll.h index 2de1af8..5b71a51 100644 --- a/icuSources/i18n/include/unicode/tblcoll.h +++ b/icuSources/include/_foundation_unicode/tblcoll.h @@ -62,16 +62,16 @@ #ifndef TBLCOLL_H #define TBLCOLL_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API #if !UCONFIG_NO_COLLATION -#include "unicode/coll.h" -#include "unicode/locid.h" -#include "unicode/uiter.h" -#include "unicode/ucol.h" +#include <_foundation_unicode/coll.h> +#include <_foundation_unicode/locid.h> +#include <_foundation_unicode/uiter.h> +#include <_foundation_unicode/ucol.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/include/unicode/timezone.h b/icuSources/include/_foundation_unicode/timezone.h similarity index 99% rename from icuSources/i18n/include/unicode/timezone.h rename to icuSources/include/_foundation_unicode/timezone.h index 382ad97..a951ab5 100644 --- a/icuSources/i18n/include/unicode/timezone.h +++ b/icuSources/include/_foundation_unicode/timezone.h @@ -29,7 +29,7 @@ #ifndef TIMEZONE_H #define TIMEZONE_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API @@ -40,10 +40,10 @@ #if !UCONFIG_NO_FORMATTING -#include "unicode/uobject.h" -#include "unicode/unistr.h" -#include "unicode/ures.h" -#include "unicode/ucal.h" +#include <_foundation_unicode/uobject.h> +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/ures.h> +#include <_foundation_unicode/ucal.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/include/unicode/tmunit.h b/icuSources/include/_foundation_unicode/tmunit.h similarity index 97% rename from icuSources/i18n/include/unicode/tmunit.h rename to icuSources/include/_foundation_unicode/tmunit.h index 24abb49..125af99 100644 --- a/icuSources/i18n/include/unicode/tmunit.h +++ b/icuSources/include/_foundation_unicode/tmunit.h @@ -16,11 +16,11 @@ * \brief C++ API: time unit object */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API -#include "unicode/measunit.h" +#include <_foundation_unicode/measunit.h> #if !UCONFIG_NO_FORMATTING diff --git a/icuSources/i18n/include/unicode/tmutamt.h b/icuSources/include/_foundation_unicode/tmutamt.h similarity index 97% rename from icuSources/i18n/include/unicode/tmutamt.h rename to icuSources/include/_foundation_unicode/tmutamt.h index 88e892f..3da1198 100644 --- a/icuSources/i18n/include/unicode/tmutamt.h +++ b/icuSources/include/_foundation_unicode/tmutamt.h @@ -16,14 +16,14 @@ * \brief C++ API: time unit amount object. */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API #if !UCONFIG_NO_FORMATTING -#include "unicode/measure.h" -#include "unicode/tmunit.h" +#include <_foundation_unicode/measure.h> +#include <_foundation_unicode/tmunit.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/include/unicode/tmutfmt.h b/icuSources/include/_foundation_unicode/tmutfmt.h similarity index 96% rename from icuSources/i18n/include/unicode/tmutfmt.h rename to icuSources/include/_foundation_unicode/tmutfmt.h index 02e0563..b04e5bb 100644 --- a/icuSources/i18n/include/unicode/tmutfmt.h +++ b/icuSources/include/_foundation_unicode/tmutfmt.h @@ -10,7 +10,7 @@ #ifndef __TMUTFMT_H__ #define __TMUTFMT_H__ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> /** * \file @@ -22,12 +22,12 @@ #if !UCONFIG_NO_FORMATTING -#include "unicode/unistr.h" -#include "unicode/tmunit.h" -#include "unicode/tmutamt.h" -#include "unicode/measfmt.h" -#include "unicode/numfmt.h" -#include "unicode/plurrule.h" +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/tmunit.h> +#include <_foundation_unicode/tmutamt.h> +#include <_foundation_unicode/measfmt.h> +#include <_foundation_unicode/numfmt.h> +#include <_foundation_unicode/plurrule.h> #ifndef U_HIDE_DEPRECATED_API diff --git a/icuSources/i18n/include/unicode/translit.h b/icuSources/include/_foundation_unicode/translit.h similarity index 99% rename from icuSources/i18n/include/unicode/translit.h rename to icuSources/include/_foundation_unicode/translit.h index 56eb644..f43f5c7 100644 --- a/icuSources/i18n/include/unicode/translit.h +++ b/icuSources/include/_foundation_unicode/translit.h @@ -12,7 +12,7 @@ #ifndef TRANSLIT_H #define TRANSLIT_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API @@ -23,11 +23,11 @@ #if !UCONFIG_NO_TRANSLITERATION -#include "unicode/uobject.h" -#include "unicode/unistr.h" -#include "unicode/parseerr.h" -#include "unicode/utrans.h" // UTransPosition, UTransDirection -#include "unicode/strenum.h" +#include <_foundation_unicode/uobject.h> +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/parseerr.h> +#include <_foundation_unicode/utrans.h> // UTransPosition, UTransDirection +#include <_foundation_unicode/strenum.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/include/unicode/tzfmt.h b/icuSources/include/_foundation_unicode/tzfmt.h similarity index 99% rename from icuSources/i18n/include/unicode/tzfmt.h rename to icuSources/include/_foundation_unicode/tzfmt.h index 6db8477..239da51 100644 --- a/icuSources/i18n/include/unicode/tzfmt.h +++ b/icuSources/include/_foundation_unicode/tzfmt.h @@ -14,15 +14,15 @@ * \brief C++ API: TimeZoneFormat */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API #if !UCONFIG_NO_FORMATTING -#include "unicode/format.h" -#include "unicode/timezone.h" -#include "unicode/tznames.h" +#include <_foundation_unicode/format.h> +#include <_foundation_unicode/timezone.h> +#include <_foundation_unicode/tznames.h> U_CDECL_BEGIN /** diff --git a/icuSources/i18n/include/unicode/tznames.h b/icuSources/include/_foundation_unicode/tznames.h similarity index 99% rename from icuSources/i18n/include/unicode/tznames.h rename to icuSources/include/_foundation_unicode/tznames.h index b32e956..3d6ea45 100644 --- a/icuSources/i18n/include/unicode/tznames.h +++ b/icuSources/include/_foundation_unicode/tznames.h @@ -13,14 +13,14 @@ * \file * \brief C++ API: TimeZoneNames */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API #if !UCONFIG_NO_FORMATTING -#include "unicode/uloc.h" -#include "unicode/unistr.h" +#include <_foundation_unicode/uloc.h> +#include <_foundation_unicode/unistr.h> U_CDECL_BEGIN diff --git a/icuSources/i18n/include/unicode/tzrule.h b/icuSources/include/_foundation_unicode/tzrule.h similarity index 99% rename from icuSources/i18n/include/unicode/tzrule.h rename to icuSources/include/_foundation_unicode/tzrule.h index 9ec1e96..1143788 100644 --- a/icuSources/i18n/include/unicode/tzrule.h +++ b/icuSources/include/_foundation_unicode/tzrule.h @@ -14,15 +14,15 @@ * \brief C++ API: Time zone rule classes */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API #if !UCONFIG_NO_FORMATTING -#include "unicode/uobject.h" -#include "unicode/unistr.h" -#include "unicode/dtrule.h" +#include <_foundation_unicode/uobject.h> +#include <_foundation_unicode/unistr.h> +#include <_foundation_unicode/dtrule.h> U_NAMESPACE_BEGIN diff --git a/icuSources/i18n/include/unicode/tztrans.h b/icuSources/include/_foundation_unicode/tztrans.h similarity index 98% rename from icuSources/i18n/include/unicode/tztrans.h rename to icuSources/include/_foundation_unicode/tztrans.h index 5adbeb3..9e195a0 100644 --- a/icuSources/i18n/include/unicode/tztrans.h +++ b/icuSources/include/_foundation_unicode/tztrans.h @@ -14,13 +14,13 @@ * \brief C++ API: Time zone transition */ -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if U_SHOW_CPLUSPLUS_API #if !UCONFIG_NO_FORMATTING -#include "unicode/uobject.h" +#include <_foundation_unicode/uobject.h> U_NAMESPACE_BEGIN diff --git a/icuSources/common/include/unicode/ualoc.h b/icuSources/include/_foundation_unicode/ualoc.h similarity index 99% rename from icuSources/common/include/unicode/ualoc.h rename to icuSources/include/_foundation_unicode/ualoc.h index 2d1c5c6..d25d77d 100644 --- a/icuSources/common/include/unicode/ualoc.h +++ b/icuSources/include/_foundation_unicode/ualoc.h @@ -7,7 +7,7 @@ #ifndef UALOC_H #define UALOC_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #ifndef U_HIDE_DRAFT_API diff --git a/icuSources/i18n/include/unicode/uameasureformat.h b/icuSources/include/_foundation_unicode/uameasureformat.h similarity index 98% rename from icuSources/i18n/include/unicode/uameasureformat.h rename to icuSources/include/_foundation_unicode/uameasureformat.h index 68a07e9..9e9e818 100644 --- a/icuSources/i18n/include/unicode/uameasureformat.h +++ b/icuSources/include/_foundation_unicode/uameasureformat.h @@ -7,16 +7,16 @@ #ifndef UAMEASUREFORMAT_H #define UAMEASUREFORMAT_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #ifndef U_HIDE_DRAFT_API -#include "unicode/localpointer.h" -#include "unicode/unum.h" -#include "unicode/umisc.h" -#include "unicode/uameasureunit.h" -#include "unicode/ufieldpositer.h" +#include <_foundation_unicode/localpointer.h> +#include <_foundation_unicode/unum.h> +#include <_foundation_unicode/umisc.h> +#include <_foundation_unicode/uameasureunit.h> +#include <_foundation_unicode/ufieldpositer.h> /** * \file diff --git a/icuSources/i18n/include/unicode/uameasureunit.h b/icuSources/include/_foundation_unicode/uameasureunit.h similarity index 100% rename from icuSources/i18n/include/unicode/uameasureunit.h rename to icuSources/include/_foundation_unicode/uameasureunit.h diff --git a/icuSources/i18n/include/unicode/uatimeunitformat.h b/icuSources/include/_foundation_unicode/uatimeunitformat.h similarity index 98% rename from icuSources/i18n/include/unicode/uatimeunitformat.h rename to icuSources/include/_foundation_unicode/uatimeunitformat.h index cdecd36..7bdc104 100644 --- a/icuSources/i18n/include/unicode/uatimeunitformat.h +++ b/icuSources/include/_foundation_unicode/uatimeunitformat.h @@ -7,13 +7,13 @@ #ifndef UATIMEUNITFORMAT_H #define UATIMEUNITFORMAT_H -#include "unicode/utypes.h" +#include <_foundation_unicode/utypes.h> #if !UCONFIG_NO_FORMATTING #ifndef U_HIDE_DRAFT_API -#include "unicode/localpointer.h" -#include "unicode/unum.h" +#include <_foundation_unicode/localpointer.h> +#include <_foundation_unicode/unum.h> /** * \file diff --git a/icuSources/common/include/unicode/ubidi.h b/icuSources/include/_foundation_unicode/ubidi.h similarity index 99% rename from icuSources/common/include/unicode/ubidi.h rename to icuSources/include/_foundation_unicode/ubidi.h index 5ceb8ab..8283a8e 100644 --- a/icuSources/common/include/unicode/ubidi.h +++ b/icuSources/include/_foundation_unicode/ubidi.h @@ -19,11 +19,11 @@ #ifndef UBIDI_H #define UBIDI_H -#include "unicode/utypes.h" -#include "unicode/uchar.h" +#include <_foundation_unicode/utypes.h> +#include <_foundation_unicode/uchar.h> #if U_SHOW_CPLUSPLUS_API -#include "unicode/localpointer.h" +#include <_foundation_unicode/localpointer.h> #endif // U_SHOW_CPLUSPLUS_API /** @@ -84,7 +84,7 @@ * * 

  * \code
- *#include 
+ *#include <_foundation_unicode/ubidi.h>
  *
  *typedef enum {
  *     styleNormal=0, styleSelected=1,
diff --git a/icuSources/common/include/unicode/ubiditransform.h b/icuSources/include/_foundation_unicode/ubiditransform.h
similarity index 98%
rename from icuSources/common/include/unicode/ubiditransform.h
rename to icuSources/include/_foundation_unicode/ubiditransform.h
index 24433aa..ff82f2f 100644
--- a/icuSources/common/include/unicode/ubiditransform.h
+++ b/icuSources/include/_foundation_unicode/ubiditransform.h
@@ -18,12 +18,12 @@
 #ifndef UBIDITRANSFORM_H
 #define UBIDITRANSFORM_H
 
-#include "unicode/utypes.h"
-#include "unicode/ubidi.h"
-#include "unicode/uchar.h"
+#include <_foundation_unicode/utypes.h>
+#include <_foundation_unicode/ubidi.h>
+#include <_foundation_unicode/uchar.h>
 
 #if U_SHOW_CPLUSPLUS_API
-#include "unicode/localpointer.h"
+#include <_foundation_unicode/localpointer.h>
 #endif   // U_SHOW_CPLUSPLUS_API
 
 /**
diff --git a/icuSources/common/include/unicode/ubrk.h b/icuSources/include/_foundation_unicode/ubrk.h
similarity index 99%
rename from icuSources/common/include/unicode/ubrk.h
rename to icuSources/include/_foundation_unicode/ubrk.h
index 349de8d..559ab94 100644
--- a/icuSources/common/include/unicode/ubrk.h
+++ b/icuSources/include/_foundation_unicode/ubrk.h
@@ -10,12 +10,12 @@
 #ifndef UBRK_H
 #define UBRK_H
 
-#include "unicode/utypes.h"
-#include "unicode/uloc.h"
-#include "unicode/utext.h"
+#include <_foundation_unicode/utypes.h>
+#include <_foundation_unicode/uloc.h>
+#include <_foundation_unicode/utext.h>
 
 #if U_SHOW_CPLUSPLUS_API
-#include "unicode/localpointer.h"
+#include <_foundation_unicode/localpointer.h>
 #endif   // U_SHOW_CPLUSPLUS_API
 
 /**
@@ -33,7 +33,7 @@
 
 #if !UCONFIG_NO_BREAK_ITERATION
 
-#include "unicode/parseerr.h"
+#include <_foundation_unicode/parseerr.h>
 
 /**
  * \file
diff --git a/icuSources/i18n/include/unicode/ucal.h b/icuSources/include/_foundation_unicode/ucal.h
similarity index 99%
rename from icuSources/i18n/include/unicode/ucal.h
rename to icuSources/include/_foundation_unicode/ucal.h
index da4f5ee..8f9b64e 100644
--- a/icuSources/i18n/include/unicode/ucal.h
+++ b/icuSources/include/_foundation_unicode/ucal.h
@@ -10,12 +10,12 @@
 #ifndef UCAL_H
 #define UCAL_H
 
-#include "unicode/utypes.h"
-#include "unicode/uenum.h"
-#include "unicode/uloc.h"
+#include <_foundation_unicode/utypes.h>
+#include <_foundation_unicode/uenum.h>
+#include <_foundation_unicode/uloc.h>
 
 #if U_SHOW_CPLUSPLUS_API
-#include "unicode/localpointer.h"
+#include <_foundation_unicode/localpointer.h>
 #endif   // U_SHOW_CPLUSPLUS_API
 
 #if !UCONFIG_NO_FORMATTING
diff --git a/icuSources/common/include/unicode/ucasemap.h b/icuSources/include/_foundation_unicode/ucasemap.h
similarity index 98%
rename from icuSources/common/include/unicode/ucasemap.h
rename to icuSources/include/_foundation_unicode/ucasemap.h
index d1c1b48..b7859cf 100644
--- a/icuSources/common/include/unicode/ucasemap.h
+++ b/icuSources/include/_foundation_unicode/ucasemap.h
@@ -21,12 +21,12 @@
 #ifndef __UCASEMAP_H__
 #define __UCASEMAP_H__
 
-#include "unicode/utypes.h"
-#include "unicode/stringoptions.h"
-#include "unicode/ustring.h"
+#include <_foundation_unicode/utypes.h>
+#include <_foundation_unicode/stringoptions.h>
+#include <_foundation_unicode/ustring.h>
 
 #if U_SHOW_CPLUSPLUS_API
-#include "unicode/localpointer.h"
+#include <_foundation_unicode/localpointer.h>
 #endif   // U_SHOW_CPLUSPLUS_API
 
 /**
diff --git a/icuSources/common/include/unicode/ucat.h b/icuSources/include/_foundation_unicode/ucat.h
similarity index 98%
rename from icuSources/common/include/unicode/ucat.h
rename to icuSources/include/_foundation_unicode/ucat.h
index 9385034..42b2ba6 100644
--- a/icuSources/common/include/unicode/ucat.h
+++ b/icuSources/include/_foundation_unicode/ucat.h
@@ -13,8 +13,8 @@
 #ifndef UCAT_H
 #define UCAT_H
 
-#include "unicode/utypes.h"
-#include "unicode/ures.h"
+#include <_foundation_unicode/utypes.h>
+#include <_foundation_unicode/ures.h>
 
 /**
  * \file
diff --git a/icuSources/common/include/unicode/uchar.h b/icuSources/include/_foundation_unicode/uchar.h
similarity index 99%
rename from icuSources/common/include/unicode/uchar.h
rename to icuSources/include/_foundation_unicode/uchar.h
index 6bb68e6..7468dc9 100644
--- a/icuSources/common/include/unicode/uchar.h
+++ b/icuSources/include/_foundation_unicode/uchar.h
@@ -25,9 +25,9 @@
 #ifndef UCHAR_H
 #define UCHAR_H
 
-#include "unicode/utypes.h"
-#include "unicode/stringoptions.h"
-#include "unicode/ucpmap.h"
+#include <_foundation_unicode/utypes.h>
+#include <_foundation_unicode/stringoptions.h>
+#include <_foundation_unicode/ucpmap.h>
 
 #if !defined(USET_DEFINED) && !defined(U_IN_DOXYGEN)
 
@@ -35,7 +35,7 @@
 
 /**
  * USet is the C API type corresponding to C++ class UnicodeSet.
- * It is forward-declared here to avoid including unicode/uset.h file if related
+ * It is forward-declared here to avoid including _foundation_unicode/uset.h file if related
  * APIs are not used.
  *
  * @see ucnv_getUnicodeSet
diff --git a/icuSources/common/include/unicode/ucharstrie.h b/icuSources/include/_foundation_unicode/ucharstrie.h
similarity index 99%
rename from icuSources/common/include/unicode/ucharstrie.h
rename to icuSources/include/_foundation_unicode/ucharstrie.h
index 064244a..df09053 100644
--- a/icuSources/common/include/unicode/ucharstrie.h
+++ b/icuSources/include/_foundation_unicode/ucharstrie.h
@@ -23,13 +23,13 @@
  *                 to integer values.
  */
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 
 #if U_SHOW_CPLUSPLUS_API
 
-#include "unicode/unistr.h"
-#include "unicode/uobject.h"
-#include "unicode/ustringtrie.h"
+#include <_foundation_unicode/unistr.h>
+#include <_foundation_unicode/uobject.h>
+#include <_foundation_unicode/ustringtrie.h>
 
 U_NAMESPACE_BEGIN
 
diff --git a/icuSources/common/include/unicode/ucharstriebuilder.h b/icuSources/include/_foundation_unicode/ucharstriebuilder.h
similarity index 97%
rename from icuSources/common/include/unicode/ucharstriebuilder.h
rename to icuSources/include/_foundation_unicode/ucharstriebuilder.h
index 5c8aa33..a433114 100644
--- a/icuSources/common/include/unicode/ucharstriebuilder.h
+++ b/icuSources/include/_foundation_unicode/ucharstriebuilder.h
@@ -17,13 +17,13 @@
 #ifndef __UCHARSTRIEBUILDER_H__
 #define __UCHARSTRIEBUILDER_H__
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 
 #if U_SHOW_CPLUSPLUS_API
 
-#include "unicode/stringtriebuilder.h"
-#include "unicode/ucharstrie.h"
-#include "unicode/unistr.h"
+#include <_foundation_unicode/stringtriebuilder.h>
+#include <_foundation_unicode/ucharstrie.h>
+#include <_foundation_unicode/unistr.h>
 
 /**
  * \file
diff --git a/icuSources/common/include/unicode/uchriter.h b/icuSources/include/_foundation_unicode/uchriter.h
similarity index 99%
rename from icuSources/common/include/unicode/uchriter.h
rename to icuSources/include/_foundation_unicode/uchriter.h
index 9fae5e7..15ca1a5 100644
--- a/icuSources/common/include/unicode/uchriter.h
+++ b/icuSources/include/_foundation_unicode/uchriter.h
@@ -10,11 +10,11 @@
 #ifndef UCHRITER_H
 #define UCHRITER_H
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 
 #if U_SHOW_CPLUSPLUS_API
 
-#include "unicode/chariter.h"
+#include <_foundation_unicode/chariter.h>
 
 /**
  * \file 
diff --git a/icuSources/common/include/unicode/uclean.h b/icuSources/include/_foundation_unicode/uclean.h
similarity index 99%
rename from icuSources/common/include/unicode/uclean.h
rename to icuSources/include/_foundation_unicode/uclean.h
index c2d920a..837e177 100644
--- a/icuSources/common/include/unicode/uclean.h
+++ b/icuSources/include/_foundation_unicode/uclean.h
@@ -17,7 +17,7 @@
 #ifndef __UCLEAN_H__
 #define __UCLEAN_H__
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 /**
  * \file
  * \brief C API: Initialize and clean up ICU
diff --git a/icuSources/common/include/unicode/ucnv.h b/icuSources/include/_foundation_unicode/ucnv.h
similarity index 99%
rename from icuSources/common/include/unicode/ucnv.h
rename to icuSources/include/_foundation_unicode/ucnv.h
index 20c173b..e80fd68 100644
--- a/icuSources/common/include/unicode/ucnv.h
+++ b/icuSources/include/_foundation_unicode/ucnv.h
@@ -48,11 +48,11 @@
 #ifndef UCNV_H
 #define UCNV_H
 
-#include "unicode/ucnv_err.h"
-#include "unicode/uenum.h"
+#include <_foundation_unicode/ucnv_err.h>
+#include <_foundation_unicode/uenum.h>
 
 #if U_SHOW_CPLUSPLUS_API
-#include "unicode/localpointer.h"
+#include <_foundation_unicode/localpointer.h>
 #endif   // U_SHOW_CPLUSPLUS_API
 
 #if !defined(USET_DEFINED) && !defined(U_IN_DOXYGEN)
@@ -61,7 +61,7 @@
 
 /**
  * USet is the C API type corresponding to C++ class UnicodeSet.
- * It is forward-declared here to avoid including unicode/uset.h file if related
+ * It is forward-declared here to avoid including _foundation_unicode/uset.h file if related
  * conversion APIs are not used.
  *
  * @see ucnv_getUnicodeSet
diff --git a/icuSources/common/include/unicode/ucnv_cb.h b/icuSources/include/_foundation_unicode/ucnv_cb.h
similarity index 98%
rename from icuSources/common/include/unicode/ucnv_cb.h
rename to icuSources/include/_foundation_unicode/ucnv_cb.h
index b4ef992..9274b95 100644
--- a/icuSources/common/include/unicode/ucnv_cb.h
+++ b/icuSources/include/_foundation_unicode/ucnv_cb.h
@@ -63,12 +63,12 @@
 #ifndef UCNV_CB_H
 #define UCNV_CB_H
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 
 #if !UCONFIG_NO_CONVERSION
 
-#include "unicode/ucnv.h"
-#include "unicode/ucnv_err.h"
+#include <_foundation_unicode/ucnv.h>
+#include <_foundation_unicode/ucnv_err.h>
 
 /**
  * ONLY used by FromU callback functions.
diff --git a/icuSources/common/include/unicode/ucnv_err.h b/icuSources/include/_foundation_unicode/ucnv_err.h
similarity index 99%
rename from icuSources/common/include/unicode/ucnv_err.h
rename to icuSources/include/_foundation_unicode/ucnv_err.h
index c743e56..8772980 100644
--- a/icuSources/common/include/unicode/ucnv_err.h
+++ b/icuSources/include/_foundation_unicode/ucnv_err.h
@@ -85,7 +85,7 @@
 #ifndef UCNV_ERR_H
 #define UCNV_ERR_H
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 
 #if !UCONFIG_NO_CONVERSION
 
diff --git a/icuSources/common/include/unicode/ucnvsel.h b/icuSources/include/_foundation_unicode/ucnvsel.h
similarity index 96%
rename from icuSources/common/include/unicode/ucnvsel.h
rename to icuSources/include/_foundation_unicode/ucnvsel.h
index 9373ec9..5a94f99 100644
--- a/icuSources/common/include/unicode/ucnvsel.h
+++ b/icuSources/include/_foundation_unicode/ucnvsel.h
@@ -21,17 +21,17 @@
 #ifndef __ICU_UCNV_SEL_H__
 #define __ICU_UCNV_SEL_H__
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 
 #if !UCONFIG_NO_CONVERSION
 
-#include "unicode/uset.h"
-#include "unicode/utf16.h"
-#include "unicode/uenum.h"
-#include "unicode/ucnv.h"
+#include <_foundation_unicode/uset.h>
+#include <_foundation_unicode/utf16.h>
+#include <_foundation_unicode/uenum.h>
+#include <_foundation_unicode/ucnv.h>
 
 #if U_SHOW_CPLUSPLUS_API
-#include "unicode/localpointer.h"
+#include <_foundation_unicode/localpointer.h>
 #endif   // U_SHOW_CPLUSPLUS_API
 
 /**
diff --git a/icuSources/i18n/include/unicode/ucol.h b/icuSources/include/_foundation_unicode/ucol.h
similarity index 99%
rename from icuSources/i18n/include/unicode/ucol.h
rename to icuSources/include/_foundation_unicode/ucol.h
index 2496331..41399d8 100644
--- a/icuSources/i18n/include/unicode/ucol.h
+++ b/icuSources/include/_foundation_unicode/ucol.h
@@ -10,18 +10,18 @@
 #ifndef UCOL_H
 #define UCOL_H
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 
 #if !UCONFIG_NO_COLLATION
 
-#include "unicode/unorm.h"
-#include "unicode/parseerr.h"
-#include "unicode/uloc.h"
-#include "unicode/uset.h"
-#include "unicode/uscript.h"
+#include <_foundation_unicode/unorm.h>
+#include <_foundation_unicode/parseerr.h>
+#include <_foundation_unicode/uloc.h>
+#include <_foundation_unicode/uset.h>
+#include <_foundation_unicode/uscript.h>
 
 #if U_SHOW_CPLUSPLUS_API
-#include "unicode/localpointer.h"
+#include <_foundation_unicode/localpointer.h>
 #endif   // U_SHOW_CPLUSPLUS_API
 
 /**
diff --git a/icuSources/i18n/include/unicode/ucoleitr.h b/icuSources/include/_foundation_unicode/ucoleitr.h
similarity index 99%
rename from icuSources/i18n/include/unicode/ucoleitr.h
rename to icuSources/include/_foundation_unicode/ucoleitr.h
index d61b62a..bc8631b 100644
--- a/icuSources/i18n/include/unicode/ucoleitr.h
+++ b/icuSources/include/_foundation_unicode/ucoleitr.h
@@ -18,7 +18,7 @@
 #ifndef UCOLEITR_H
 #define UCOLEITR_H
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 
 #if !UCONFIG_NO_COLLATION
 
@@ -49,7 +49,7 @@
 #endif  /* U_HIDE_INTERNAL_API */
 #endif  // APPLE_ICU_CHANGES
 
-#include "unicode/ucol.h"
+#include <_foundation_unicode/ucol.h>
 
 /** 
  * The UCollationElements struct.
diff --git a/icuSources/common/include/unicode/uconfig.h b/icuSources/include/_foundation_unicode/uconfig.h
similarity index 100%
rename from icuSources/common/include/unicode/uconfig.h
rename to icuSources/include/_foundation_unicode/uconfig.h
diff --git a/icuSources/common/include/unicode/ucpmap.h b/icuSources/include/_foundation_unicode/ucpmap.h
similarity index 99%
rename from icuSources/common/include/unicode/ucpmap.h
rename to icuSources/include/_foundation_unicode/ucpmap.h
index a740bd1..d562a6c 100644
--- a/icuSources/common/include/unicode/ucpmap.h
+++ b/icuSources/include/_foundation_unicode/ucpmap.h
@@ -7,7 +7,7 @@
 #ifndef __UCPMAP_H__
 #define __UCPMAP_H__
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 
 U_CDECL_BEGIN
 
diff --git a/icuSources/common/include/unicode/ucptrie.h b/icuSources/include/_foundation_unicode/ucptrie.h
similarity index 99%
rename from icuSources/common/include/unicode/ucptrie.h
rename to icuSources/include/_foundation_unicode/ucptrie.h
index dadef79..55537f0 100644
--- a/icuSources/common/include/unicode/ucptrie.h
+++ b/icuSources/include/_foundation_unicode/ucptrie.h
@@ -7,12 +7,12 @@
 #ifndef __UCPTRIE_H__
 #define __UCPTRIE_H__
 
-#include "unicode/utypes.h"
-#include "unicode/ucpmap.h"
-#include "unicode/utf8.h"
+#include <_foundation_unicode/utypes.h>
+#include <_foundation_unicode/ucpmap.h>
+#include <_foundation_unicode/utf8.h>
 
 #if U_SHOW_CPLUSPLUS_API
-#include "unicode/localpointer.h"
+#include <_foundation_unicode/localpointer.h>
 #endif   // U_SHOW_CPLUSPLUS_API
 
 U_CDECL_BEGIN
diff --git a/icuSources/i18n/include/unicode/ucsdet.h b/icuSources/include/_foundation_unicode/ucsdet.h
similarity index 99%
rename from icuSources/i18n/include/unicode/ucsdet.h
rename to icuSources/include/_foundation_unicode/ucsdet.h
index a474c3b..877d242 100644
--- a/icuSources/i18n/include/unicode/ucsdet.h
+++ b/icuSources/include/_foundation_unicode/ucsdet.h
@@ -21,14 +21,14 @@
 #ifndef __UCSDET_H
 #define __UCSDET_H
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 
 #if !UCONFIG_NO_CONVERSION
 
-#include "unicode/uenum.h"
+#include <_foundation_unicode/uenum.h>
 
 #if U_SHOW_CPLUSPLUS_API
-#include "unicode/localpointer.h"
+#include <_foundation_unicode/localpointer.h>
 #endif   // U_SHOW_CPLUSPLUS_API
 
 /**
diff --git a/icuSources/common/include/unicode/ucurr.h b/icuSources/include/_foundation_unicode/ucurr.h
similarity index 99%
rename from icuSources/common/include/unicode/ucurr.h
rename to icuSources/include/_foundation_unicode/ucurr.h
index 5589e79..4675fd3 100644
--- a/icuSources/common/include/unicode/ucurr.h
+++ b/icuSources/include/_foundation_unicode/ucurr.h
@@ -9,8 +9,8 @@
 #ifndef _UCURR_H_
 #define _UCURR_H_
 
-#include "unicode/utypes.h"
-#include "unicode/uenum.h"
+#include <_foundation_unicode/utypes.h>
+#include <_foundation_unicode/uenum.h>
 
 /**
  * \file 
diff --git a/icuSources/i18n/include/unicode/udat.h b/icuSources/include/_foundation_unicode/udat.h
similarity index 99%
rename from icuSources/i18n/include/unicode/udat.h
rename to icuSources/include/_foundation_unicode/udat.h
index b92fa2d..8013d00 100644
--- a/icuSources/i18n/include/unicode/udat.h
+++ b/icuSources/include/_foundation_unicode/udat.h
@@ -10,17 +10,17 @@
 #ifndef UDAT_H
 #define UDAT_H
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 
 #if !UCONFIG_NO_FORMATTING
 
-#include "unicode/ucal.h"
-#include "unicode/unum.h"
-#include "unicode/udisplaycontext.h"
-#include "unicode/ufieldpositer.h"
+#include <_foundation_unicode/ucal.h>
+#include <_foundation_unicode/unum.h>
+#include <_foundation_unicode/udisplaycontext.h>
+#include <_foundation_unicode/ufieldpositer.h>
 
 #if U_SHOW_CPLUSPLUS_API
-#include "unicode/localpointer.h"
+#include <_foundation_unicode/localpointer.h>
 #endif   // U_SHOW_CPLUSPLUS_API
 
 /**
diff --git a/icuSources/common/include/unicode/udata.h b/icuSources/include/_foundation_unicode/udata.h
similarity index 99%
rename from icuSources/common/include/unicode/udata.h
rename to icuSources/include/_foundation_unicode/udata.h
index a3b30ad..9104f55 100644
--- a/icuSources/common/include/unicode/udata.h
+++ b/icuSources/include/_foundation_unicode/udata.h
@@ -19,10 +19,10 @@
 #ifndef __UDATA_H__
 #define __UDATA_H__
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 
 #if U_SHOW_CPLUSPLUS_API
-#include "unicode/localpointer.h"
+#include <_foundation_unicode/localpointer.h>
 #endif   // U_SHOW_CPLUSPLUS_API
 
 U_CDECL_BEGIN
diff --git a/icuSources/i18n/include/unicode/udateintervalformat.h b/icuSources/include/_foundation_unicode/udateintervalformat.h
similarity index 98%
rename from icuSources/i18n/include/unicode/udateintervalformat.h
rename to icuSources/include/_foundation_unicode/udateintervalformat.h
index 4418212..3937f94 100644
--- a/icuSources/i18n/include/unicode/udateintervalformat.h
+++ b/icuSources/include/_foundation_unicode/udateintervalformat.h
@@ -10,17 +10,17 @@
 #ifndef UDATEINTERVALFORMAT_H
 #define UDATEINTERVALFORMAT_H
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 
 #if !UCONFIG_NO_FORMATTING
 
-#include "unicode/ucal.h"
-#include "unicode/umisc.h"
-#include "unicode/uformattedvalue.h"
-#include "unicode/udisplaycontext.h"
+#include <_foundation_unicode/ucal.h>
+#include <_foundation_unicode/umisc.h>
+#include <_foundation_unicode/uformattedvalue.h>
+#include <_foundation_unicode/udisplaycontext.h>
 
 #if U_SHOW_CPLUSPLUS_API
-#include "unicode/localpointer.h"
+#include <_foundation_unicode/localpointer.h>
 #endif   // U_SHOW_CPLUSPLUS_API
 
 /**
diff --git a/icuSources/i18n/include/unicode/udatintv.h b/icuSources/include/_foundation_unicode/udatintv.h
similarity index 97%
rename from icuSources/i18n/include/unicode/udatintv.h
rename to icuSources/include/_foundation_unicode/udatintv.h
index 6ecda62..1769be2 100644
--- a/icuSources/i18n/include/unicode/udatintv.h
+++ b/icuSources/include/_foundation_unicode/udatintv.h
@@ -7,12 +7,12 @@
 #ifndef UDATINTV_H
 #define UDATINTV_H
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 
 #if !UCONFIG_NO_FORMATTING
 
-#include "unicode/umisc.h"
-#include "unicode/udateintervalformat.h"
+#include <_foundation_unicode/umisc.h>
+#include <_foundation_unicode/udateintervalformat.h>
 
 /**
  * NOTE - THE TEMPORARY APPLE INTERFACES DECLARED HERE ARE OBSOLETE, PLEASE USE
diff --git a/icuSources/i18n/include/unicode/udatpg.h b/icuSources/include/_foundation_unicode/udatpg.h
similarity index 99%
rename from icuSources/i18n/include/unicode/udatpg.h
rename to icuSources/include/_foundation_unicode/udatpg.h
index d68141a..8194dba 100644
--- a/icuSources/i18n/include/unicode/udatpg.h
+++ b/icuSources/include/_foundation_unicode/udatpg.h
@@ -19,17 +19,17 @@
 #ifndef __UDATPG_H__
 #define __UDATPG_H__
 
-#include "unicode/utypes.h"
-#include "unicode/udat.h"
-#include "unicode/uenum.h"
+#include <_foundation_unicode/utypes.h>
+#include <_foundation_unicode/udat.h>
+#include <_foundation_unicode/uenum.h>
 
 #if U_SHOW_CPLUSPLUS_API
-#include "unicode/localpointer.h"
+#include <_foundation_unicode/localpointer.h>
 #endif   // U_SHOW_CPLUSPLUS_API
 
 /**
  * \file
- * \brief C API: Wrapper for icu::DateTimePatternGenerator (unicode/dtptngen.h).
+ * \brief C API: Wrapper for icu::DateTimePatternGenerator (_foundation_unicode/dtptngen.h).
  *
  * UDateTimePatternGenerator provides flexible generation of date format patterns, 
  * like "yy-MM-dd". The user can build up the generator by adding successive 
diff --git a/icuSources/common/include/unicode/udisplaycontext.h b/icuSources/include/_foundation_unicode/udisplaycontext.h
similarity index 99%
rename from icuSources/common/include/unicode/udisplaycontext.h
rename to icuSources/include/_foundation_unicode/udisplaycontext.h
index 50442ef..4b26bfd 100644
--- a/icuSources/common/include/unicode/udisplaycontext.h
+++ b/icuSources/include/_foundation_unicode/udisplaycontext.h
@@ -10,7 +10,7 @@
 #ifndef UDISPLAYCONTEXT_H
 #define UDISPLAYCONTEXT_H
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 
 #if !UCONFIG_NO_FORMATTING
 
diff --git a/icuSources/i18n/include/unicode/udisplayoptions.h b/icuSources/include/_foundation_unicode/udisplayoptions.h
similarity index 99%
rename from icuSources/i18n/include/unicode/udisplayoptions.h
rename to icuSources/include/_foundation_unicode/udisplayoptions.h
index 1ecdf1d..0274036 100644
--- a/icuSources/i18n/include/unicode/udisplayoptions.h
+++ b/icuSources/include/_foundation_unicode/udisplayoptions.h
@@ -4,7 +4,7 @@
 #ifndef __UDISPLAYOPTIONS_H__
 #define __UDISPLAYOPTIONS_H__
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 
 #if !UCONFIG_NO_FORMATTING
 
@@ -16,7 +16,7 @@
  * as a more modern version of the UDisplayContext mechanism.
  */
 
-#include "unicode/uversion.h"
+#include <_foundation_unicode/uversion.h>
 
 #ifndef U_HIDE_DRAFT_API
 
diff --git a/icuSources/common/include/unicode/uenum.h b/icuSources/include/_foundation_unicode/uenum.h
similarity index 98%
rename from icuSources/common/include/unicode/uenum.h
rename to icuSources/include/_foundation_unicode/uenum.h
index d9c893e..9139981 100644
--- a/icuSources/common/include/unicode/uenum.h
+++ b/icuSources/include/_foundation_unicode/uenum.h
@@ -19,10 +19,10 @@
 #ifndef __UENUM_H
 #define __UENUM_H
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 
 #if U_SHOW_CPLUSPLUS_API
-#include "unicode/localpointer.h"
+#include <_foundation_unicode/localpointer.h>
 
 U_NAMESPACE_BEGIN
 class StringEnumeration;
diff --git a/icuSources/i18n/include/unicode/ufieldpositer.h b/icuSources/include/_foundation_unicode/ufieldpositer.h
similarity index 98%
rename from icuSources/i18n/include/unicode/ufieldpositer.h
rename to icuSources/include/_foundation_unicode/ufieldpositer.h
index 83df184..9a7dbec 100644
--- a/icuSources/i18n/include/unicode/ufieldpositer.h
+++ b/icuSources/include/_foundation_unicode/ufieldpositer.h
@@ -10,12 +10,12 @@
 #ifndef UFIELDPOSITER_H
 #define UFIELDPOSITER_H
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 
 #if !UCONFIG_NO_FORMATTING
 
 #if U_SHOW_CPLUSPLUS_API
-#include "unicode/localpointer.h"
+#include <_foundation_unicode/localpointer.h>
 #endif   // U_SHOW_CPLUSPLUS_API
 
 /**
diff --git a/icuSources/i18n/include/unicode/uformattable.h b/icuSources/include/_foundation_unicode/uformattable.h
similarity index 99%
rename from icuSources/i18n/include/unicode/uformattable.h
rename to icuSources/include/_foundation_unicode/uformattable.h
index 4c4a307..d3ed3e1 100644
--- a/icuSources/i18n/include/unicode/uformattable.h
+++ b/icuSources/include/_foundation_unicode/uformattable.h
@@ -30,12 +30,12 @@
 #ifndef UFORMATTABLE_H
 #define UFORMATTABLE_H
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 
 #if !UCONFIG_NO_FORMATTING
 
 #if U_SHOW_CPLUSPLUS_API
-#include "unicode/localpointer.h"
+#include <_foundation_unicode/localpointer.h>
 #endif   // U_SHOW_CPLUSPLUS_API
 
 /**
diff --git a/icuSources/i18n/include/unicode/uformattedvalue.h b/icuSources/include/_foundation_unicode/uformattedvalue.h
similarity index 99%
rename from icuSources/i18n/include/unicode/uformattedvalue.h
rename to icuSources/include/_foundation_unicode/uformattedvalue.h
index af6d18f..2e23575 100644
--- a/icuSources/i18n/include/unicode/uformattedvalue.h
+++ b/icuSources/include/_foundation_unicode/uformattedvalue.h
@@ -4,11 +4,11 @@
 #ifndef __UFORMATTEDVALUE_H__
 #define __UFORMATTEDVALUE_H__
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 
 #if !UCONFIG_NO_FORMATTING
 
-#include "unicode/ufieldpositer.h"
+#include <_foundation_unicode/ufieldpositer.h>
 
 /**
  * \file
diff --git a/icuSources/i18n/include/unicode/ugender.h b/icuSources/include/_foundation_unicode/ugender.h
similarity index 95%
rename from icuSources/i18n/include/unicode/ugender.h
rename to icuSources/include/_foundation_unicode/ugender.h
index 7093686..19c6f91 100644
--- a/icuSources/i18n/include/unicode/ugender.h
+++ b/icuSources/include/_foundation_unicode/ugender.h
@@ -10,12 +10,12 @@
 #ifndef UGENDER_H
 #define UGENDER_H
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 
 #if !UCONFIG_NO_FORMATTING
 
 #if U_SHOW_CPLUSPLUS_API
-#include "unicode/localpointer.h"
+#include <_foundation_unicode/localpointer.h>
 #endif   // U_SHOW_CPLUSPLUS_API
 
 /**
diff --git a/icuSources/common/include/unicode/uidna.h b/icuSources/include/_foundation_unicode/uidna.h
similarity index 99%
rename from icuSources/common/include/unicode/uidna.h
rename to icuSources/include/_foundation_unicode/uidna.h
index 24a81ce..3bc9148 100644
--- a/icuSources/common/include/unicode/uidna.h
+++ b/icuSources/include/_foundation_unicode/uidna.h
@@ -19,15 +19,15 @@
 #ifndef __UIDNA_H__
 #define __UIDNA_H__
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 
 #if !UCONFIG_NO_IDNA
 
 #include 
-#include "unicode/parseerr.h"
+#include <_foundation_unicode/parseerr.h>
 
 #if U_SHOW_CPLUSPLUS_API
-#include "unicode/localpointer.h"
+#include <_foundation_unicode/localpointer.h>
 #endif   // U_SHOW_CPLUSPLUS_API
 
 /**
diff --git a/icuSources/common/include/unicode/uiter.h b/icuSources/include/_foundation_unicode/uiter.h
similarity index 99%
rename from icuSources/common/include/unicode/uiter.h
rename to icuSources/include/_foundation_unicode/uiter.h
index be232c7..ed41114 100644
--- a/icuSources/common/include/unicode/uiter.h
+++ b/icuSources/include/_foundation_unicode/uiter.h
@@ -26,7 +26,7 @@
  * @see UCharIterator
  */
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 
 #if U_SHOW_CPLUSPLUS_API
     U_NAMESPACE_BEGIN
diff --git a/icuSources/common/include/unicode/uldnames.h b/icuSources/include/_foundation_unicode/uldnames.h
similarity index 98%
rename from icuSources/common/include/unicode/uldnames.h
rename to icuSources/include/_foundation_unicode/uldnames.h
index b4ba8be..0906ecc 100644
--- a/icuSources/common/include/unicode/uldnames.h
+++ b/icuSources/include/_foundation_unicode/uldnames.h
@@ -15,12 +15,12 @@
  * \brief C API: Provides display names of Locale ids and their components.
  */
 
-#include "unicode/utypes.h"
-#include "unicode/uscript.h"
-#include "unicode/udisplaycontext.h"
+#include <_foundation_unicode/utypes.h>
+#include <_foundation_unicode/uscript.h>
+#include <_foundation_unicode/udisplaycontext.h>
 
 #if U_SHOW_CPLUSPLUS_API
-#include "unicode/localpointer.h"
+#include <_foundation_unicode/localpointer.h>
 #endif   // U_SHOW_CPLUSPLUS_API
 
 /**
diff --git a/icuSources/i18n/include/unicode/ulistformatter.h b/icuSources/include/_foundation_unicode/ulistformatter.h
similarity index 98%
rename from icuSources/i18n/include/unicode/ulistformatter.h
rename to icuSources/include/_foundation_unicode/ulistformatter.h
index 8334c78..87b205b 100644
--- a/icuSources/i18n/include/unicode/ulistformatter.h
+++ b/icuSources/include/_foundation_unicode/ulistformatter.h
@@ -10,14 +10,14 @@
 #ifndef ULISTFORMATTER_H
 #define ULISTFORMATTER_H
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 
 #if !UCONFIG_NO_FORMATTING
 
-#include "unicode/uformattedvalue.h"
+#include <_foundation_unicode/uformattedvalue.h>
 
 #if U_SHOW_CPLUSPLUS_API
-#include "unicode/localpointer.h"
+#include <_foundation_unicode/localpointer.h>
 #endif   // U_SHOW_CPLUSPLUS_API
 
 /**
diff --git a/icuSources/common/include/unicode/uloc.h b/icuSources/include/_foundation_unicode/uloc.h
similarity index 99%
rename from icuSources/common/include/unicode/uloc.h
rename to icuSources/include/_foundation_unicode/uloc.h
index 9332b29..2861ab9 100644
--- a/icuSources/common/include/unicode/uloc.h
+++ b/icuSources/include/_foundation_unicode/uloc.h
@@ -23,8 +23,8 @@
 #ifndef ULOC_H
 #define ULOC_H
 
-#include "unicode/utypes.h"
-#include "unicode/uenum.h"
+#include <_foundation_unicode/utypes.h>
+#include <_foundation_unicode/uenum.h>
 
 /**
  * \file
diff --git a/icuSources/common/include/unicode/ulocdata.h b/icuSources/include/_foundation_unicode/ulocdata.h
similarity index 98%
rename from icuSources/common/include/unicode/ulocdata.h
rename to icuSources/include/_foundation_unicode/ulocdata.h
index 3647df9..014ddfa 100644
--- a/icuSources/common/include/unicode/ulocdata.h
+++ b/icuSources/include/_foundation_unicode/ulocdata.h
@@ -19,12 +19,12 @@
 #ifndef __ULOCDATA_H__
 #define __ULOCDATA_H__
 
-#include "unicode/ures.h"
-#include "unicode/uloc.h"
-#include "unicode/uset.h"
+#include <_foundation_unicode/ures.h>
+#include <_foundation_unicode/uloc.h>
+#include <_foundation_unicode/uset.h>
 
 #if U_SHOW_CPLUSPLUS_API
-#include "unicode/localpointer.h"
+#include <_foundation_unicode/localpointer.h>
 #endif   // U_SHOW_CPLUSPLUS_API
 
 /**
diff --git a/icuSources/common/include/unicode/umachine.h b/icuSources/include/_foundation_unicode/umachine.h
similarity index 99%
rename from icuSources/common/include/unicode/umachine.h
rename to icuSources/include/_foundation_unicode/umachine.h
index ada99e0..642a4f9 100644
--- a/icuSources/common/include/unicode/umachine.h
+++ b/icuSources/include/_foundation_unicode/umachine.h
@@ -43,7 +43,7 @@
 /* which are contained in the platform-specific file platform.h             */
 /*==========================================================================*/
 
-#include "unicode/ptypes.h" /* platform.h is included in ptypes.h */
+#include <_foundation_unicode/ptypes.h> /* platform.h is included in ptypes.h */
 
 /*
  * ANSI C headers:
@@ -517,6 +517,6 @@ typedef int32_t UChar32;
  */
 #define U_SENTINEL (-1)
 
-#include "unicode/urename.h"
+#include <_foundation_unicode/urename.h>
 
 #endif
diff --git a/icuSources/common/include/unicode/umisc.h b/icuSources/include/_foundation_unicode/umisc.h
similarity index 97%
rename from icuSources/common/include/unicode/umisc.h
rename to icuSources/include/_foundation_unicode/umisc.h
index 4e9dda7..2eaa5b2 100644
--- a/icuSources/common/include/unicode/umisc.h
+++ b/icuSources/include/_foundation_unicode/umisc.h
@@ -17,7 +17,7 @@
 #ifndef UMISC_H
 #define UMISC_H
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 
 /**
  * \file
diff --git a/icuSources/i18n/include/unicode/umsg.h b/icuSources/include/_foundation_unicode/umsg.h
similarity index 99%
rename from icuSources/i18n/include/unicode/umsg.h
rename to icuSources/include/_foundation_unicode/umsg.h
index c955dc1..0f698e1 100644
--- a/icuSources/i18n/include/unicode/umsg.h
+++ b/icuSources/include/_foundation_unicode/umsg.h
@@ -20,16 +20,16 @@
 #ifndef UMSG_H
 #define UMSG_H
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 
 #if !UCONFIG_NO_FORMATTING
 
-#include "unicode/uloc.h"
-#include "unicode/parseerr.h"
+#include <_foundation_unicode/uloc.h>
+#include <_foundation_unicode/parseerr.h>
 #include 
 
 #if U_SHOW_CPLUSPLUS_API
-#include "unicode/localpointer.h"
+#include <_foundation_unicode/localpointer.h>
 #endif   // U_SHOW_CPLUSPLUS_API
 
 /**
diff --git a/icuSources/common/include/unicode/umutablecptrie.h b/icuSources/include/_foundation_unicode/umutablecptrie.h
similarity index 97%
rename from icuSources/common/include/unicode/umutablecptrie.h
rename to icuSources/include/_foundation_unicode/umutablecptrie.h
index d60fd61..1df90f9 100644
--- a/icuSources/common/include/unicode/umutablecptrie.h
+++ b/icuSources/include/_foundation_unicode/umutablecptrie.h
@@ -7,14 +7,14 @@
 #ifndef __UMUTABLECPTRIE_H__
 #define __UMUTABLECPTRIE_H__
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 
-#include "unicode/ucpmap.h"
-#include "unicode/ucptrie.h"
-#include "unicode/utf8.h"
+#include <_foundation_unicode/ucpmap.h>
+#include <_foundation_unicode/ucptrie.h>
+#include <_foundation_unicode/utf8.h>
 
 #if U_SHOW_CPLUSPLUS_API
-#include "unicode/localpointer.h"
+#include <_foundation_unicode/localpointer.h>
 #endif   // U_SHOW_CPLUSPLUS_API
 
 U_CDECL_BEGIN
diff --git a/icuSources/common/include/unicode/unifilt.h b/icuSources/include/_foundation_unicode/unifilt.h
similarity index 96%
rename from icuSources/common/include/unicode/unifilt.h
rename to icuSources/include/_foundation_unicode/unifilt.h
index 0fcaf4b..9701587 100644
--- a/icuSources/common/include/unicode/unifilt.h
+++ b/icuSources/include/_foundation_unicode/unifilt.h
@@ -12,12 +12,12 @@
 #ifndef UNIFILT_H
 #define UNIFILT_H
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 
 #if U_SHOW_CPLUSPLUS_API
 
-#include "unicode/unifunct.h"
-#include "unicode/unimatch.h"
+#include <_foundation_unicode/unifunct.h>
+#include <_foundation_unicode/unimatch.h>
 
 /**
  * \file 
diff --git a/icuSources/common/include/unicode/unifunct.h b/icuSources/include/_foundation_unicode/unifunct.h
similarity index 98%
rename from icuSources/common/include/unicode/unifunct.h
rename to icuSources/include/_foundation_unicode/unifunct.h
index 8751302..c9f7970 100644
--- a/icuSources/common/include/unicode/unifunct.h
+++ b/icuSources/include/_foundation_unicode/unifunct.h
@@ -12,11 +12,11 @@
 #ifndef UNIFUNCT_H
 #define UNIFUNCT_H
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 
 #if U_SHOW_CPLUSPLUS_API
 
-#include "unicode/uobject.h"
+#include <_foundation_unicode/uobject.h>
 
 /**
  * \file 
diff --git a/icuSources/common/include/unicode/unimatch.h b/icuSources/include/_foundation_unicode/unimatch.h
similarity index 99%
rename from icuSources/common/include/unicode/unimatch.h
rename to icuSources/include/_foundation_unicode/unimatch.h
index 302332f..d78ef63 100644
--- a/icuSources/common/include/unicode/unimatch.h
+++ b/icuSources/include/_foundation_unicode/unimatch.h
@@ -10,7 +10,7 @@
 #ifndef UNIMATCH_H
 #define UNIMATCH_H
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 
 /**
  * \file 
diff --git a/icuSources/i18n/include/unicode/unirepl.h b/icuSources/include/_foundation_unicode/unirepl.h
similarity index 98%
rename from icuSources/i18n/include/unicode/unirepl.h
rename to icuSources/include/_foundation_unicode/unirepl.h
index 7f6edcf..f7f4184 100644
--- a/icuSources/i18n/include/unicode/unirepl.h
+++ b/icuSources/include/_foundation_unicode/unirepl.h
@@ -12,7 +12,7 @@
 #ifndef UNIREPL_H
 #define UNIREPL_H
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 
 #if U_SHOW_CPLUSPLUS_API
 
diff --git a/icuSources/common/include/unicode/uniset.h b/icuSources/include/_foundation_unicode/uniset.h
similarity index 99%
rename from icuSources/common/include/unicode/uniset.h
rename to icuSources/include/_foundation_unicode/uniset.h
index cd1e821..98f3508 100644
--- a/icuSources/common/include/unicode/uniset.h
+++ b/icuSources/include/_foundation_unicode/uniset.h
@@ -13,14 +13,14 @@
 #ifndef UNICODESET_H
 #define UNICODESET_H
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 
 #if U_SHOW_CPLUSPLUS_API
 
-#include "unicode/ucpmap.h"
-#include "unicode/unifilt.h"
-#include "unicode/unistr.h"
-#include "unicode/uset.h"
+#include <_foundation_unicode/ucpmap.h>
+#include <_foundation_unicode/unifilt.h>
+#include <_foundation_unicode/unistr.h>
+#include <_foundation_unicode/uset.h>
 
 /**
  * \file
diff --git a/icuSources/common/include/unicode/unistr.h b/icuSources/include/_foundation_unicode/unistr.h
similarity index 99%
rename from icuSources/common/include/unicode/unistr.h
rename to icuSources/include/_foundation_unicode/unistr.h
index 567e46c..395f0b8 100644
--- a/icuSources/common/include/unicode/unistr.h
+++ b/icuSources/include/_foundation_unicode/unistr.h
@@ -28,18 +28,18 @@
  * \brief C++ API: Unicode String
  */
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 
 #if U_SHOW_CPLUSPLUS_API
 
 #include 
-#include "unicode/char16ptr.h"
-#include "unicode/rep.h"
-#include "unicode/std_string.h"
-#include "unicode/stringpiece.h"
-#include "unicode/bytestream.h"
+#include <_foundation_unicode/char16ptr.h>
+#include <_foundation_unicode/rep.h>
+#include <_foundation_unicode/std_string.h>
+#include <_foundation_unicode/stringpiece.h>
+#include <_foundation_unicode/bytestream.h>
 
-struct UConverter;          // unicode/ucnv.h
+struct UConverter;          // _foundation_unicode/ucnv.h
 
 #ifndef USTRING_H
 /**
@@ -53,7 +53,7 @@ U_CAPI int32_t U_EXPORT2 u_strlen(const UChar *s);
 U_NAMESPACE_BEGIN
 
 #if !UCONFIG_NO_BREAK_ITERATION
-class BreakIterator;        // unicode/brkiter.h
+class BreakIterator;        // _foundation_unicode/brkiter.h
 #endif
 class Edits;
 
@@ -78,11 +78,11 @@ UStringCaseMapper(int32_t caseLocale, uint32_t options,
 
 U_NAMESPACE_BEGIN
 
-class Locale;               // unicode/locid.h
+class Locale;               // _foundation_unicode/locid.h
 class StringCharacterIterator;
-class UnicodeStringAppendable;  // unicode/appendable.h
+class UnicodeStringAppendable;  // _foundation_unicode/appendable.h
 
-/* The  include has been moved to unicode/ustream.h */
+/* The  include has been moved to _foundation_unicode/ustream.h */
 
 /**
  * Constant to be used in the UnicodeString(char *, int32_t, EInvariant) constructor
diff --git a/icuSources/common/include/unicode/unorm.h b/icuSources/include/_foundation_unicode/unorm.h
similarity index 99%
rename from icuSources/common/include/unicode/unorm.h
rename to icuSources/include/_foundation_unicode/unorm.h
index 38fb895..5f7cc72 100644
--- a/icuSources/common/include/unicode/unorm.h
+++ b/icuSources/include/_foundation_unicode/unorm.h
@@ -17,12 +17,12 @@
 #ifndef UNORM_H
 #define UNORM_H
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 
 #if !UCONFIG_NO_NORMALIZATION
 
-#include "unicode/uiter.h"
-#include "unicode/unorm2.h"
+#include <_foundation_unicode/uiter.h>
+#include <_foundation_unicode/unorm2.h>
 
 /**
  * \file
diff --git a/icuSources/common/include/unicode/unorm2.h b/icuSources/include/_foundation_unicode/unorm2.h
similarity index 99%
rename from icuSources/common/include/unicode/unorm2.h
rename to icuSources/include/_foundation_unicode/unorm2.h
index 24417b7..fce5de5 100644
--- a/icuSources/common/include/unicode/unorm2.h
+++ b/icuSources/include/_foundation_unicode/unorm2.h
@@ -30,12 +30,12 @@
  * For more details see the Normalizer2 C++ class.
  */
 
-#include "unicode/utypes.h"
-#include "unicode/stringoptions.h"
-#include "unicode/uset.h"
+#include <_foundation_unicode/utypes.h>
+#include <_foundation_unicode/stringoptions.h>
+#include <_foundation_unicode/uset.h>
 
 #if U_SHOW_CPLUSPLUS_API
-#include "unicode/localpointer.h"
+#include <_foundation_unicode/localpointer.h>
 #endif   // U_SHOW_CPLUSPLUS_API
 
 /**
diff --git a/icuSources/i18n/include/unicode/unum.h b/icuSources/include/_foundation_unicode/unum.h
similarity index 99%
rename from icuSources/i18n/include/unicode/unum.h
rename to icuSources/include/_foundation_unicode/unum.h
index d1a4db5..56c6a5b 100644
--- a/icuSources/i18n/include/unicode/unum.h
+++ b/icuSources/include/_foundation_unicode/unum.h
@@ -14,20 +14,20 @@
 #ifndef _UNUM
 #define _UNUM
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 
 #if !UCONFIG_NO_FORMATTING
 
-#include "unicode/uloc.h"
-#include "unicode/ucurr.h"
-#include "unicode/umisc.h"
-#include "unicode/parseerr.h"
-#include "unicode/uformattable.h"
-#include "unicode/udisplaycontext.h"
-#include "unicode/ufieldpositer.h"
+#include <_foundation_unicode/uloc.h>
+#include <_foundation_unicode/ucurr.h>
+#include <_foundation_unicode/umisc.h>
+#include <_foundation_unicode/parseerr.h>
+#include <_foundation_unicode/uformattable.h>
+#include <_foundation_unicode/udisplaycontext.h>
+#include <_foundation_unicode/ufieldpositer.h>
 
 #if U_SHOW_CPLUSPLUS_API
-#include "unicode/localpointer.h"
+#include <_foundation_unicode/localpointer.h>
 #endif   // U_SHOW_CPLUSPLUS_API
 
 /**
diff --git a/icuSources/i18n/include/unicode/unumberformatter.h b/icuSources/include/_foundation_unicode/unumberformatter.h
similarity index 98%
rename from icuSources/i18n/include/unicode/unumberformatter.h
rename to icuSources/include/_foundation_unicode/unumberformatter.h
index 253b30b..182e88f 100644
--- a/icuSources/i18n/include/unicode/unumberformatter.h
+++ b/icuSources/include/_foundation_unicode/unumberformatter.h
@@ -4,14 +4,14 @@
 #ifndef __UNUMBERFORMATTER_H__
 #define __UNUMBERFORMATTER_H__
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 
 #if !UCONFIG_NO_FORMATTING
 
-#include "unicode/parseerr.h"
-#include "unicode/ufieldpositer.h"
-#include "unicode/umisc.h"
-#include "unicode/uformattedvalue.h"
+#include <_foundation_unicode/parseerr.h>
+#include <_foundation_unicode/ufieldpositer.h>
+#include <_foundation_unicode/umisc.h>
+#include <_foundation_unicode/uformattedvalue.h>
 
 
 /**
@@ -19,11 +19,11 @@
  * \brief C API: Localized number formatting; not recommended for C++.
  *
  * This is the C-compatible version of the NumberFormatter API introduced in ICU 60. C++ users should
- * include unicode/numberformatter.h and use the proper C++ APIs.
+ * include _foundation_unicode/numberformatter.h and use the proper C++ APIs.
  *
  * The C API accepts a number skeleton string for specifying the settings for formatting, which covers a
  * very large subset of all possible number formatting features. For more information on number skeleton
- * strings, see unicode/numberformatter.h.
+ * strings, see _foundation_unicode/numberformatter.h.
  *
  * When using UNumberFormatter, which is treated as immutable, the results are exported to a mutable
  * UFormattedNumber object, which you subsequently use for populating your string buffer or iterating over
diff --git a/icuSources/i18n/include/unicode/unumberrangeformatter.h b/icuSources/include/_foundation_unicode/unumberrangeformatter.h
similarity index 97%
rename from icuSources/i18n/include/unicode/unumberrangeformatter.h
rename to icuSources/include/_foundation_unicode/unumberrangeformatter.h
index 106942f..0ec60bc 100644
--- a/icuSources/i18n/include/unicode/unumberrangeformatter.h
+++ b/icuSources/include/_foundation_unicode/unumberrangeformatter.h
@@ -4,15 +4,15 @@
 #ifndef __UNUMBERRANGEFORMATTER_H__
 #define __UNUMBERRANGEFORMATTER_H__
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 
 #if !UCONFIG_NO_FORMATTING
 
-#include "unicode/parseerr.h"
-#include "unicode/ufieldpositer.h"
-#include "unicode/umisc.h"
-#include "unicode/uformattedvalue.h"
-#include "unicode/uformattable.h"
+#include <_foundation_unicode/parseerr.h>
+#include <_foundation_unicode/ufieldpositer.h>
+#include <_foundation_unicode/umisc.h>
+#include <_foundation_unicode/uformattedvalue.h>
+#include <_foundation_unicode/uformattable.h>
 
 
 /**
@@ -20,7 +20,7 @@
  * \brief C API: Localized number range formatting
  *
  * This is the C-compatible version of the NumberRangeFormatter API. C++ users
- * should include unicode/numberrangeformatter.h and use the proper C++ APIs.
+ * should include _foundation_unicode/numberrangeformatter.h and use the proper C++ APIs.
  *
  * First create a UNumberRangeFormatter, which is immutable, and then format to
  * a UFormattedNumberRange.
diff --git a/icuSources/i18n/include/unicode/unumsys.h b/icuSources/include/_foundation_unicode/unumsys.h
similarity index 98%
rename from icuSources/i18n/include/unicode/unumsys.h
rename to icuSources/include/_foundation_unicode/unumsys.h
index fe713ea..8d9d941 100644
--- a/icuSources/i18n/include/unicode/unumsys.h
+++ b/icuSources/include/_foundation_unicode/unumsys.h
@@ -10,14 +10,14 @@
 #ifndef UNUMSYS_H
 #define UNUMSYS_H
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 
 #if !UCONFIG_NO_FORMATTING
 
-#include "unicode/uenum.h"
+#include <_foundation_unicode/uenum.h>
 
 #if U_SHOW_CPLUSPLUS_API
-#include "unicode/localpointer.h"
+#include <_foundation_unicode/localpointer.h>
 #endif   // U_SHOW_CPLUSPLUS_API
 
 /**
diff --git a/icuSources/common/include/unicode/uobject.h b/icuSources/include/_foundation_unicode/uobject.h
similarity index 99%
rename from icuSources/common/include/unicode/uobject.h
rename to icuSources/include/_foundation_unicode/uobject.h
index 25a8330..dc7f36f 100644
--- a/icuSources/common/include/unicode/uobject.h
+++ b/icuSources/include/_foundation_unicode/uobject.h
@@ -19,11 +19,11 @@
 #ifndef __UOBJECT_H__
 #define __UOBJECT_H__
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 
 #if U_SHOW_CPLUSPLUS_API
 
-#include "unicode/platform.h"
+#include <_foundation_unicode/platform.h>
 
 /**
  * \file
diff --git a/icuSources/i18n/include/unicode/uplrule.h b/icuSources/include/_foundation_unicode/uplrule.h
similarity index 97%
rename from icuSources/i18n/include/unicode/uplrule.h
rename to icuSources/include/_foundation_unicode/uplrule.h
index b82cd68..d9c85c5 100644
--- a/icuSources/i18n/include/unicode/uplrule.h
+++ b/icuSources/include/_foundation_unicode/uplrule.h
@@ -7,11 +7,11 @@
 #ifndef UPLRULE_H
 #define UPLRULE_H
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 
 #if !UCONFIG_NO_FORMATTING
 
-#include "unicode/upluralrules.h"
+#include <_foundation_unicode/upluralrules.h>
 
 /**
  * NOTE - THE TEMPORARY APPLE INTERFACES DECLARED HERE ARE OBSOLETE, PLEASE USE
diff --git a/icuSources/i18n/include/unicode/upluralrules.h b/icuSources/include/_foundation_unicode/upluralrules.h
similarity index 98%
rename from icuSources/i18n/include/unicode/upluralrules.h
rename to icuSources/include/_foundation_unicode/upluralrules.h
index 15dfd4c..dcbcc4a 100644
--- a/icuSources/i18n/include/unicode/upluralrules.h
+++ b/icuSources/include/_foundation_unicode/upluralrules.h
@@ -10,18 +10,18 @@
 #ifndef UPLURALRULES_H
 #define UPLURALRULES_H
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 
 #if !UCONFIG_NO_FORMATTING
 
-#include "unicode/uenum.h"
+#include <_foundation_unicode/uenum.h>
 
 #if U_SHOW_CPLUSPLUS_API
-#include "unicode/localpointer.h"
+#include <_foundation_unicode/localpointer.h>
 #endif   // U_SHOW_CPLUSPLUS_API
 
 #ifndef U_HIDE_INTERNAL_API
-#include "unicode/unum.h"
+#include <_foundation_unicode/unum.h>
 #endif  /* U_HIDE_INTERNAL_API */
 
 // Forward-declaration
diff --git a/icuSources/common/include/unicode/urbtok.h b/icuSources/include/_foundation_unicode/urbtok.h
similarity index 99%
rename from icuSources/common/include/unicode/urbtok.h
rename to icuSources/include/_foundation_unicode/urbtok.h
index d4d6430..236517d 100644
--- a/icuSources/common/include/unicode/urbtok.h
+++ b/icuSources/include/_foundation_unicode/urbtok.h
@@ -13,12 +13,12 @@
 #ifndef URBTOK_H
 #define URBTOK_H
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 
 #if !UCONFIG_NO_BREAK_ITERATION
 
-#include "unicode/ubrk.h"
-#include "unicode/parseerr.h"
+#include <_foundation_unicode/ubrk.h>
+#include <_foundation_unicode/parseerr.h>
 
 /**
  * The interfaces here are meant to extend the functionality of the standard
diff --git a/icuSources/i18n/include/unicode/uregex.h b/icuSources/include/_foundation_unicode/uregex.h
similarity index 99%
rename from icuSources/i18n/include/unicode/uregex.h
rename to icuSources/include/_foundation_unicode/uregex.h
index e946e63..2794ee4 100644
--- a/icuSources/i18n/include/unicode/uregex.h
+++ b/icuSources/include/_foundation_unicode/uregex.h
@@ -25,15 +25,15 @@
 #ifndef UREGEX_H
 #define UREGEX_H
 
-#include "unicode/utext.h"
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utext.h>
+#include <_foundation_unicode/utypes.h>
 
 #if !UCONFIG_NO_REGULAR_EXPRESSIONS
 
-#include "unicode/parseerr.h"
+#include <_foundation_unicode/parseerr.h>
 
 #if U_SHOW_CPLUSPLUS_API
-#include "unicode/localpointer.h"
+#include <_foundation_unicode/localpointer.h>
 #endif   // U_SHOW_CPLUSPLUS_API
 
 struct URegularExpression;
diff --git a/icuSources/i18n/include/unicode/uregion.h b/icuSources/include/_foundation_unicode/uregion.h
similarity index 99%
rename from icuSources/i18n/include/unicode/uregion.h
rename to icuSources/include/_foundation_unicode/uregion.h
index 25472ae..057ca24 100644
--- a/icuSources/i18n/include/unicode/uregion.h
+++ b/icuSources/include/_foundation_unicode/uregion.h
@@ -10,8 +10,8 @@
 #ifndef UREGION_H
 #define UREGION_H
 
-#include "unicode/utypes.h"
-#include "unicode/uenum.h"
+#include <_foundation_unicode/utypes.h>
+#include <_foundation_unicode/uenum.h>
 
 /**
  * \file
diff --git a/icuSources/i18n/include/unicode/ureldatefmt.h b/icuSources/include/_foundation_unicode/ureldatefmt.h
similarity index 98%
rename from icuSources/i18n/include/unicode/ureldatefmt.h
rename to icuSources/include/_foundation_unicode/ureldatefmt.h
index 3c44890..f886f9c 100644
--- a/icuSources/i18n/include/unicode/ureldatefmt.h
+++ b/icuSources/include/_foundation_unicode/ureldatefmt.h
@@ -10,16 +10,16 @@
 #ifndef URELDATEFMT_H
 #define URELDATEFMT_H
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 
 #if !UCONFIG_NO_FORMATTING && !UCONFIG_NO_BREAK_ITERATION
 
-#include "unicode/unum.h"
-#include "unicode/udisplaycontext.h"
-#include "unicode/uformattedvalue.h"
+#include <_foundation_unicode/unum.h>
+#include <_foundation_unicode/udisplaycontext.h>
+#include <_foundation_unicode/uformattedvalue.h>
 
 #if U_SHOW_CPLUSPLUS_API
-#include "unicode/localpointer.h"
+#include <_foundation_unicode/localpointer.h>
 #endif   // U_SHOW_CPLUSPLUS_API
 
 /**
diff --git a/icuSources/common/include/unicode/urename.h b/icuSources/include/_foundation_unicode/urename.h
similarity index 99%
rename from icuSources/common/include/unicode/urename.h
rename to icuSources/include/_foundation_unicode/urename.h
index d3e23b8..7c5652b 100644
--- a/icuSources/common/include/unicode/urename.h
+++ b/icuSources/include/_foundation_unicode/urename.h
@@ -29,25 +29,25 @@
  *   - by changing the default setting of U_DISABLE_RENAMING in uconfig.h
  */
 
-#include "unicode/uconfig.h"
+#include <_foundation_unicode/uconfig.h>
 
 #if !U_DISABLE_RENAMING
 
 // Disable Renaming for Visual Studio's IntelliSense feature, so that 'Go-to-Definition' (F12) will work.
 #if !(defined(_MSC_VER) && defined(__INTELLISENSE__))
 
-/* We need the U_ICU_ENTRY_POINT_RENAME definition. There's a default one in unicode/uvernum.h we can use, but we will give
+/* We need the U_ICU_ENTRY_POINT_RENAME definition. There's a default one in _foundation_unicode/uvernum.h we can use, but we will give
    the platform a chance to define it first.
    Normally (if utypes.h or umachine.h was included first) this will not be necessary as it will already be defined.
  */
 
 #ifndef U_ICU_ENTRY_POINT_RENAME
-#include "unicode/umachine.h"
+#include <_foundation_unicode/umachine.h>
 #endif
 
 /* If we still don't have U_ICU_ENTRY_POINT_RENAME use the default. */
 #ifndef U_ICU_ENTRY_POINT_RENAME
-#include "unicode/uvernum.h"
+#include <_foundation_unicode/uvernum.h>
 #endif
 
 /* Error out before the following defines cause very strange and unexpected code breakage */
diff --git a/icuSources/common/include/unicode/urep.h b/icuSources/include/_foundation_unicode/urep.h
similarity index 99%
rename from icuSources/common/include/unicode/urep.h
rename to icuSources/include/_foundation_unicode/urep.h
index 932202d..8fb2991 100644
--- a/icuSources/common/include/unicode/urep.h
+++ b/icuSources/include/_foundation_unicode/urep.h
@@ -13,7 +13,7 @@
 #ifndef __UREP_H
 #define __UREP_H
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 
 U_CDECL_BEGIN
 
diff --git a/icuSources/common/include/unicode/ures.h b/icuSources/include/_foundation_unicode/ures.h
similarity index 99%
rename from icuSources/common/include/unicode/ures.h
rename to icuSources/include/_foundation_unicode/ures.h
index a6c43f9..b60802d 100644
--- a/icuSources/common/include/unicode/ures.h
+++ b/icuSources/include/_foundation_unicode/ures.h
@@ -25,11 +25,11 @@
 #ifndef URES_H
 #define URES_H
 
-#include "unicode/utypes.h"
-#include "unicode/uloc.h"
+#include <_foundation_unicode/utypes.h>
+#include <_foundation_unicode/uloc.h>
 
 #if U_SHOW_CPLUSPLUS_API
-#include "unicode/localpointer.h"
+#include <_foundation_unicode/localpointer.h>
 #endif   // U_SHOW_CPLUSPLUS_API
 
 /**
@@ -794,7 +794,7 @@ ures_getUTF8StringByKey(const UResourceBundle *resB,
                         UErrorCode *status);
 
 #if U_SHOW_CPLUSPLUS_API
-#include "unicode/unistr.h"
+#include <_foundation_unicode/unistr.h>
 
 U_NAMESPACE_BEGIN
 /**
diff --git a/icuSources/common/include/unicode/uscript.h b/icuSources/include/_foundation_unicode/uscript.h
similarity index 99%
rename from icuSources/common/include/unicode/uscript.h
rename to icuSources/include/_foundation_unicode/uscript.h
index dc97ab2..a1ee6e3 100644
--- a/icuSources/common/include/unicode/uscript.h
+++ b/icuSources/include/_foundation_unicode/uscript.h
@@ -17,7 +17,7 @@
 
 #ifndef USCRIPT_H
 #define USCRIPT_H
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 
 /**
  * \file
diff --git a/icuSources/i18n/include/unicode/usearch.h b/icuSources/include/_foundation_unicode/usearch.h
similarity index 99%
rename from icuSources/i18n/include/unicode/usearch.h
rename to icuSources/include/_foundation_unicode/usearch.h
index fd0b84f..d45be7d 100644
--- a/icuSources/i18n/include/unicode/usearch.h
+++ b/icuSources/include/_foundation_unicode/usearch.h
@@ -11,16 +11,16 @@
 #ifndef USEARCH_H
 #define USEARCH_H
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 
 #if !UCONFIG_NO_COLLATION && !UCONFIG_NO_BREAK_ITERATION
 
-#include "unicode/ucol.h"
-#include "unicode/ucoleitr.h"
-#include "unicode/ubrk.h"
+#include <_foundation_unicode/ucol.h>
+#include <_foundation_unicode/ucoleitr.h>
+#include <_foundation_unicode/ubrk.h>
 
 #if U_SHOW_CPLUSPLUS_API
-#include "unicode/localpointer.h"
+#include <_foundation_unicode/localpointer.h>
 #endif   // U_SHOW_CPLUSPLUS_API
 
 /**
diff --git a/icuSources/common/include/unicode/uset.h b/icuSources/include/_foundation_unicode/uset.h
similarity index 99%
rename from icuSources/common/include/unicode/uset.h
rename to icuSources/include/_foundation_unicode/uset.h
index 5dd890e..fab75e8 100644
--- a/icuSources/common/include/unicode/uset.h
+++ b/icuSources/include/_foundation_unicode/uset.h
@@ -29,11 +29,11 @@
 #ifndef __USET_H__
 #define __USET_H__
 
-#include "unicode/utypes.h"
-#include "unicode/uchar.h"
+#include <_foundation_unicode/utypes.h>
+#include <_foundation_unicode/uchar.h>
 
 #if U_SHOW_CPLUSPLUS_API
-#include "unicode/localpointer.h"
+#include <_foundation_unicode/localpointer.h>
 #endif   // U_SHOW_CPLUSPLUS_API
 
 #ifndef USET_DEFINED
diff --git a/icuSources/common/include/unicode/usetiter.h b/icuSources/include/_foundation_unicode/usetiter.h
similarity index 98%
rename from icuSources/common/include/unicode/usetiter.h
rename to icuSources/include/_foundation_unicode/usetiter.h
index 34992d9..22d2096 100644
--- a/icuSources/common/include/unicode/usetiter.h
+++ b/icuSources/include/_foundation_unicode/usetiter.h
@@ -9,12 +9,12 @@
 #ifndef USETITER_H
 #define USETITER_H
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 
 #if U_SHOW_CPLUSPLUS_API
 
-#include "unicode/uobject.h"
-#include "unicode/unistr.h"
+#include <_foundation_unicode/uobject.h>
+#include <_foundation_unicode/unistr.h>
 
 /**
  * \file 
diff --git a/icuSources/common/include/unicode/ushape.h b/icuSources/include/_foundation_unicode/ushape.h
similarity index 99%
rename from icuSources/common/include/unicode/ushape.h
rename to icuSources/include/_foundation_unicode/ushape.h
index 14371ed..9b1b5c9 100644
--- a/icuSources/common/include/unicode/ushape.h
+++ b/icuSources/include/_foundation_unicode/ushape.h
@@ -19,7 +19,7 @@
 #ifndef __USHAPE_H__
 #define __USHAPE_H__
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 
 /**
  * \file
diff --git a/icuSources/i18n/include/unicode/uspoof.h b/icuSources/include/_foundation_unicode/uspoof.h
similarity index 99%
rename from icuSources/i18n/include/unicode/uspoof.h
rename to icuSources/include/_foundation_unicode/uspoof.h
index 0aa887b..de978b8 100644
--- a/icuSources/i18n/include/unicode/uspoof.h
+++ b/icuSources/include/_foundation_unicode/uspoof.h
@@ -19,17 +19,17 @@
 #ifndef USPOOF_H
 #define USPOOF_H
 
-#include "unicode/utypes.h"
-#include "unicode/uset.h"
-#include "unicode/parseerr.h"
+#include <_foundation_unicode/utypes.h>
+#include <_foundation_unicode/uset.h>
+#include <_foundation_unicode/parseerr.h>
 
 #if !UCONFIG_NO_NORMALIZATION
 
 
 #if U_SHOW_CPLUSPLUS_API
-#include "unicode/localpointer.h"
-#include "unicode/unistr.h"
-#include "unicode/uniset.h"
+#include <_foundation_unicode/localpointer.h>
+#include <_foundation_unicode/unistr.h>
+#include <_foundation_unicode/uniset.h>
 #endif
 
 
diff --git a/icuSources/common/include/unicode/usprep.h b/icuSources/include/_foundation_unicode/usprep.h
similarity index 98%
rename from icuSources/common/include/unicode/usprep.h
rename to icuSources/include/_foundation_unicode/usprep.h
index f8a0f58..bf43ea4 100644
--- a/icuSources/common/include/unicode/usprep.h
+++ b/icuSources/include/_foundation_unicode/usprep.h
@@ -24,10 +24,10 @@
  * \brief C API: Implements the StringPrep algorithm.
  */
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 
 #if U_SHOW_CPLUSPLUS_API
-#include "unicode/localpointer.h"
+#include <_foundation_unicode/localpointer.h>
 #endif   // U_SHOW_CPLUSPLUS_API
 
 /**
@@ -64,7 +64,7 @@
  */
 #if !UCONFIG_NO_IDNA
 
-#include "unicode/parseerr.h"
+#include <_foundation_unicode/parseerr.h>
 
 /**
  * The StringPrep profile
diff --git a/icuSources/io/include/unicode/ustdio.h b/icuSources/include/_foundation_unicode/ustdio.h
similarity index 99%
rename from icuSources/io/include/unicode/ustdio.h
rename to icuSources/include/_foundation_unicode/ustdio.h
index 5aad6b9..a6e2cbe 100644
--- a/icuSources/io/include/unicode/ustdio.h
+++ b/icuSources/include/_foundation_unicode/ustdio.h
@@ -27,13 +27,13 @@
 #include 
 #include 
 
-#include "unicode/utypes.h"
-#include "unicode/ucnv.h"
-#include "unicode/utrans.h"
-#include "unicode/unum.h"
+#include <_foundation_unicode/utypes.h>
+#include <_foundation_unicode/ucnv.h>
+#include <_foundation_unicode/utrans.h>
+#include <_foundation_unicode/unum.h>
 
 #if U_SHOW_CPLUSPLUS_API
-#include "unicode/localpointer.h"
+#include <_foundation_unicode/localpointer.h>
 #endif   // U_SHOW_CPLUSPLUS_API
 
 #if !UCONFIG_NO_CONVERSION
diff --git a/icuSources/io/include/unicode/ustream.h b/icuSources/include/_foundation_unicode/ustream.h
similarity index 95%
rename from icuSources/io/include/unicode/ustream.h
rename to icuSources/include/_foundation_unicode/ustream.h
index 927342c..80ed172 100644
--- a/icuSources/io/include/unicode/ustream.h
+++ b/icuSources/include/_foundation_unicode/ustream.h
@@ -17,11 +17,11 @@
 #ifndef USTREAM_H
 #define USTREAM_H
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 
 #if U_SHOW_CPLUSPLUS_API
 
-#include "unicode/unistr.h"
+#include <_foundation_unicode/unistr.h>
 
 #if !UCONFIG_NO_CONVERSION  // not available without conversion
 
diff --git a/icuSources/common/include/unicode/ustring.h b/icuSources/include/_foundation_unicode/ustring.h
similarity index 99%
rename from icuSources/common/include/unicode/ustring.h
rename to icuSources/include/_foundation_unicode/ustring.h
index 5323736..05a4687 100644
--- a/icuSources/common/include/unicode/ustring.h
+++ b/icuSources/include/_foundation_unicode/ustring.h
@@ -18,9 +18,9 @@
 #ifndef USTRING_H
 #define USTRING_H
 
-#include "unicode/utypes.h"
-#include "unicode/putil.h"
-#include "unicode/uiter.h"
+#include <_foundation_unicode/utypes.h>
+#include <_foundation_unicode/putil.h>
+#include <_foundation_unicode/uiter.h>
 
 /**
  * \def UBRK_TYPEDEF_UBREAK_ITERATOR
@@ -29,7 +29,7 @@
 
 #ifndef UBRK_TYPEDEF_UBREAK_ITERATOR
 #   define UBRK_TYPEDEF_UBREAK_ITERATOR
-/** Simple declaration for u_strToTitle() to avoid including unicode/ubrk.h. @stable ICU 2.1*/
+/** Simple declaration for u_strToTitle() to avoid including _foundation_unicode/ubrk.h. @stable ICU 2.1*/
     typedef struct UBreakIterator UBreakIterator;
 #endif
 
diff --git a/icuSources/common/include/unicode/ustringtrie.h b/icuSources/include/_foundation_unicode/ustringtrie.h
similarity index 98%
rename from icuSources/common/include/unicode/ustringtrie.h
rename to icuSources/include/_foundation_unicode/ustringtrie.h
index fd85648..99cb6d7 100644
--- a/icuSources/common/include/unicode/ustringtrie.h
+++ b/icuSources/include/_foundation_unicode/ustringtrie.h
@@ -22,7 +22,7 @@
  * \brief C API: Helper definitions for dictionary trie APIs.
  */
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 
 
 /**
diff --git a/icuSources/common/include/unicode/utext.h b/icuSources/include/_foundation_unicode/utext.h
similarity index 99%
rename from icuSources/common/include/unicode/utext.h
rename to icuSources/include/_foundation_unicode/utext.h
index 1552682..7c321b5 100644
--- a/icuSources/common/include/unicode/utext.h
+++ b/icuSources/include/_foundation_unicode/utext.h
@@ -137,18 +137,18 @@
 
 
 
-#include "unicode/utypes.h"
-#include "unicode/uchar.h"
+#include <_foundation_unicode/utypes.h>
+#include <_foundation_unicode/uchar.h>
 #if U_SHOW_CPLUSPLUS_API
-#include "unicode/localpointer.h"
-#include "unicode/rep.h"
-#include "unicode/unistr.h"
-#include "unicode/chariter.h"
+#include <_foundation_unicode/localpointer.h>
+#include <_foundation_unicode/rep.h>
+#include <_foundation_unicode/unistr.h>
+#include <_foundation_unicode/chariter.h>
 #endif
 
 
 #if APPLE_ICU_CHANGES
-// rdar://71262794 Cannot include unicode/utext.h and unicode/umutablecptrie.h together
+// rdar://71262794 Cannot include _foundation_unicode/utext.h and unicode/umutablecptrie.h together
 #else
 U_CDECL_BEGIN
 #endif // APPLE_ICU_CHANGES
@@ -948,7 +948,7 @@ enum {
 };
 
 #if APPLE_ICU_CHANGES
-// rdar://71262794 Cannot include unicode/utext.h and unicode/umutablecptrie.h together
+// rdar://71262794 Cannot include _foundation_unicode/utext.h and unicode/umutablecptrie.h together
 // move U_CDECL_BEGIN down here from above
 U_CDECL_BEGIN
 #endif // APPLE_ICU_CHANGES
diff --git a/icuSources/common/include/unicode/utf.h b/icuSources/include/_foundation_unicode/utf.h
similarity index 98%
rename from icuSources/common/include/unicode/utf.h
rename to icuSources/include/_foundation_unicode/utf.h
index c9d5f57..b270c82 100644
--- a/icuSources/common/include/unicode/utf.h
+++ b/icuSources/include/_foundation_unicode/utf.h
@@ -116,7 +116,7 @@
 #ifndef __UTF_H__
 #define __UTF_H__
 
-#include "unicode/umachine.h"
+#include <_foundation_unicode/umachine.h>
 /* include the utfXX.h after the following definitions */
 
 /* single-code point definitions -------------------------------------------- */
@@ -214,11 +214,11 @@
 
 #if !U_NO_DEFAULT_INCLUDE_UTF_HEADERS
 
-#include "unicode/utf8.h"
-#include "unicode/utf16.h"
+#include <_foundation_unicode/utf8.h>
+#include <_foundation_unicode/utf16.h>
 
 /* utf_old.h contains deprecated, pre-ICU 2.4 definitions */
-#include "unicode/utf_old.h"
+#include <_foundation_unicode/utf_old.h>
 
 #endif  /* !U_NO_DEFAULT_INCLUDE_UTF_HEADERS */
 
diff --git a/icuSources/common/include/unicode/utf16.h b/icuSources/include/_foundation_unicode/utf16.h
similarity index 99%
rename from icuSources/common/include/unicode/utf16.h
rename to icuSources/include/_foundation_unicode/utf16.h
index 8ab8a01..aee8d7b 100644
--- a/icuSources/common/include/unicode/utf16.h
+++ b/icuSources/include/_foundation_unicode/utf16.h
@@ -35,9 +35,9 @@
 #define __UTF16_H__
 
 #include 
-#include "unicode/umachine.h"
+#include <_foundation_unicode/umachine.h>
 #ifndef __UTF_H__
-#   include "unicode/utf.h"
+#   include "_foundation_unicode/utf.h"
 #endif
 
 /* single-code point definitions -------------------------------------------- */
diff --git a/icuSources/common/include/unicode/utf32.h b/icuSources/include/_foundation_unicode/utf32.h
similarity index 100%
rename from icuSources/common/include/unicode/utf32.h
rename to icuSources/include/_foundation_unicode/utf32.h
diff --git a/icuSources/common/include/unicode/utf8.h b/icuSources/include/_foundation_unicode/utf8.h
similarity index 99%
rename from icuSources/common/include/unicode/utf8.h
rename to icuSources/include/_foundation_unicode/utf8.h
index 5a07435..c705a33 100644
--- a/icuSources/common/include/unicode/utf8.h
+++ b/icuSources/include/_foundation_unicode/utf8.h
@@ -35,9 +35,9 @@
 #define __UTF8_H__
 
 #include 
-#include "unicode/umachine.h"
+#include <_foundation_unicode/umachine.h>
 #ifndef __UTF_H__
-#   include "unicode/utf.h"
+#   include "_foundation_unicode/utf.h"
 #endif
 
 /* internal definitions ----------------------------------------------------- */
diff --git a/icuSources/common/include/unicode/utf_old.h b/icuSources/include/_foundation_unicode/utf_old.h
similarity index 99%
rename from icuSources/common/include/unicode/utf_old.h
rename to icuSources/include/_foundation_unicode/utf_old.h
index 1587c76..38e4652 100644
--- a/icuSources/common/include/unicode/utf_old.h
+++ b/icuSources/include/_foundation_unicode/utf_old.h
@@ -142,14 +142,14 @@
 #ifndef __UTF_OLD_H__
 #define __UTF_OLD_H__
 
-#include "unicode/utf.h"
-#include "unicode/utf8.h"
-#include "unicode/utf16.h"
+#include <_foundation_unicode/utf.h>
+#include <_foundation_unicode/utf8.h>
+#include <_foundation_unicode/utf16.h>
 
 /**
  * \def U_HIDE_OBSOLETE_UTF_OLD_H
  *
- * Hides the obsolete definitions in unicode/utf_old.h.
+ * Hides the obsolete definitions in _foundation_unicode/utf_old.h.
  * Recommended to be set to 1 at compile time to make sure
  * the long-deprecated macros are no longer used.
  *
@@ -786,7 +786,7 @@ U_CFUNC U_IMPORT const uint8_t utf8_countTrailBytes[];
 *   This file defines macros to deal with UTF-32 code units and code points.
 *   Signatures and semantics are the same as for the similarly named macros
 *   in utf16.h.
-*   utf32.h is included by utf.h after unicode/umachine.h

+*   utf32.h is included by utf.h after _foundation_unicode/umachine.h

 *   and some common definitions.
 *   
Usage:  ICU coding guidelines for if() statements should be followed when using these macros.
 *                  Compound statements (curly braces {}) must be used  for if-else-while...
diff --git a/icuSources/i18n/include/unicode/utmscale.h b/icuSources/include/_foundation_unicode/utmscale.h
similarity index 99%
rename from icuSources/i18n/include/unicode/utmscale.h
rename to icuSources/include/_foundation_unicode/utmscale.h
index 5a0bdc6..7b20745 100644
--- a/icuSources/i18n/include/unicode/utmscale.h
+++ b/icuSources/include/_foundation_unicode/utmscale.h
@@ -10,7 +10,7 @@
 #ifndef UTMSCALE_H
 #define UTMSCALE_H
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 
 #if !UCONFIG_NO_FORMATTING
 
diff --git a/icuSources/common/include/unicode/utrace.h b/icuSources/include/_foundation_unicode/utrace.h
similarity index 99%
rename from icuSources/common/include/unicode/utrace.h
rename to icuSources/include/_foundation_unicode/utrace.h
index 677486f..153060a 100644
--- a/icuSources/common/include/unicode/utrace.h
+++ b/icuSources/include/_foundation_unicode/utrace.h
@@ -23,7 +23,7 @@
 #define __UTRACE_H__
 
 #include 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 
 /**
  * \file
diff --git a/icuSources/i18n/include/unicode/utrans.h b/icuSources/include/_foundation_unicode/utrans.h
similarity index 99%
rename from icuSources/i18n/include/unicode/utrans.h
rename to icuSources/include/_foundation_unicode/utrans.h
index 1ad7dbd..8e4bb03 100644
--- a/icuSources/i18n/include/unicode/utrans.h
+++ b/icuSources/include/_foundation_unicode/utrans.h
@@ -13,17 +13,17 @@
 #ifndef UTRANS_H
 #define UTRANS_H
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 
 #if !UCONFIG_NO_TRANSLITERATION
 
-#include "unicode/urep.h"
-#include "unicode/parseerr.h"
-#include "unicode/uenum.h"
-#include "unicode/uset.h"
+#include <_foundation_unicode/urep.h>
+#include <_foundation_unicode/parseerr.h>
+#include <_foundation_unicode/uenum.h>
+#include <_foundation_unicode/uset.h>
 
 #if U_SHOW_CPLUSPLUS_API
-#include "unicode/localpointer.h"
+#include <_foundation_unicode/localpointer.h>
 #endif   // U_SHOW_CPLUSPLUS_API
 
 /********************************************************************
diff --git a/icuSources/common/include/unicode/utypes.h b/icuSources/include/_foundation_unicode/utypes.h
similarity index 99%
rename from icuSources/common/include/unicode/utypes.h
rename to icuSources/include/_foundation_unicode/utypes.h
index a3e0ec9..e707465 100644
--- a/icuSources/common/include/unicode/utypes.h
+++ b/icuSources/include/_foundation_unicode/utypes.h
@@ -35,9 +35,9 @@
 #define UTYPES_H
 
 
-#include "unicode/umachine.h"
-#include "unicode/uversion.h"
-#include "unicode/uconfig.h"
+#include <_foundation_unicode/umachine.h>
+#include <_foundation_unicode/uversion.h>
+#include <_foundation_unicode/uconfig.h>
 #if APPLE_ICU_CHANGES
 // rdar://10040518 2ca6a7de75.. Refine previous fix to use platform conditionals
 #if U_PLATFORM!=U_PF_IPHONE
@@ -48,7 +48,7 @@
 #endif // APPLE_ICU_CHANGES
 
 #if !U_NO_DEFAULT_INCLUDE_UTF_HEADERS
-#   include "unicode/utf.h"
+#   include "_foundation_unicode/utf.h"
 #endif
 
 /*!
@@ -454,7 +454,7 @@ typedef double UDate;
  *         // An error occurred. Handle it here.
  *     }
  *
- * C++ code should use icu::ErrorCode, available in unicode/errorcode.h, or a
+ * C++ code should use icu::ErrorCode, available in _foundation_unicode/errorcode.h, or a
  * suitable subclass.
  *
  * For more information, see:
diff --git a/icuSources/common/include/unicode/uvernum.h b/icuSources/include/_foundation_unicode/uvernum.h
similarity index 98%
rename from icuSources/common/include/unicode/uvernum.h
rename to icuSources/include/_foundation_unicode/uvernum.h
index a93f350..3684f84 100644
--- a/icuSources/common/include/unicode/uvernum.h
+++ b/icuSources/include/_foundation_unicode/uvernum.h
@@ -26,7 +26,7 @@
 
  /*
   * IMPORTANT: When updating version, the following things need to be done:
-  * source/common/unicode/uvernum.h - this file: update major, minor,
+  * source/common/_foundation_unicode/uvernum.h - this file: update major, minor,
   *        patchlevel, suffix, version, short version constants, namespace,
   *                    renaming macro, and copyright
   *
diff --git a/icuSources/common/include/unicode/uversion.h b/icuSources/include/_foundation_unicode/uversion.h
similarity index 98%
rename from icuSources/common/include/unicode/uversion.h
rename to icuSources/include/_foundation_unicode/uversion.h
index 113568d..b41bc4e 100644
--- a/icuSources/common/include/unicode/uversion.h
+++ b/icuSources/include/_foundation_unicode/uversion.h
@@ -27,10 +27,10 @@
 #ifndef UVERSION_H
 #define UVERSION_H
 
-#include "unicode/umachine.h"
+#include <_foundation_unicode/umachine.h>
 
 /* Actual version info lives in uvernum.h */
-#include "unicode/uvernum.h"
+#include <_foundation_unicode/uvernum.h>
 
 /** Maximum length of the copyright string.
  *  @stable ICU 2.4
diff --git a/icuSources/i18n/include/unicode/vtzone.h b/icuSources/include/_foundation_unicode/vtzone.h
similarity index 99%
rename from icuSources/i18n/include/unicode/vtzone.h
rename to icuSources/include/_foundation_unicode/vtzone.h
index 487810d..5a874a4 100644
--- a/icuSources/i18n/include/unicode/vtzone.h
+++ b/icuSources/include/_foundation_unicode/vtzone.h
@@ -9,7 +9,7 @@
 #ifndef VTZONE_H
 #define VTZONE_H
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 
 #if U_SHOW_CPLUSPLUS_API
 
@@ -20,7 +20,7 @@
 
 #if !UCONFIG_NO_FORMATTING
 
-#include "unicode/basictz.h"
+#include <_foundation_unicode/basictz.h>
 
 U_NAMESPACE_BEGIN
 
diff --git a/icuSources/io/CMakeLists.txt b/icuSources/io/CMakeLists.txt
new file mode 100644
index 0000000..c1c319f
--- /dev/null
+++ b/icuSources/io/CMakeLists.txt
@@ -0,0 +1,29 @@
+##===----------------------------------------------------------------------===##
+##
+## This source file is part of the SwiftFoundation open source project
+##
+## Copyright (c) 2024 Apple Inc. and the SwiftFoundation project authors
+## Licensed under Apache License v2.0
+##
+## See LICENSE.txt for license information
+## See CONTRIBUTORS.md for the list of SwiftFoundation project authors
+##
+## SPDX-License-Identifier: Apache-2.0
+##
+##===----------------------------------------------------------------------===##
+
+target_include_directories(_FoundationICU PRIVATE .)
+target_sources(_FoundationICU
+    PRIVATE
+        locbund.cpp
+        sprintf.cpp
+        sscanf.cpp
+        ucln_io.cpp
+        ufile.cpp
+        ufmt_cmn.cpp
+        uprintf.cpp
+        uprntf_p.cpp
+        uscanf.cpp
+        uscanf_p.cpp
+        ustdio.cpp
+        ustream.cpp)
diff --git a/icuSources/io/locbund.cpp b/icuSources/io/locbund.cpp
index 6c79b61..5680940 100644
--- a/icuSources/io/locbund.cpp
+++ b/icuSources/io/locbund.cpp
@@ -18,7 +18,7 @@
 *******************************************************************************
 */
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 
 #if !UCONFIG_NO_FORMATTING && !UCONFIG_NO_CONVERSION
 
@@ -29,8 +29,8 @@
 #include "ucln_io.h"
 #include "mutex.h"
 #include "umutex.h"
-#include "unicode/ustring.h"
-#include "unicode/uloc.h"
+#include <_foundation_unicode/ustring.h>
+#include <_foundation_unicode/uloc.h>
 
 static UNumberFormat *gPosixNumberFormat[ULOCALEBUNDLE_NUMBERFORMAT_COUNT];
 
diff --git a/icuSources/io/locbund.h b/icuSources/io/locbund.h
index 5879e28..c390519 100644
--- a/icuSources/io/locbund.h
+++ b/icuSources/io/locbund.h
@@ -21,11 +21,11 @@
 #ifndef LOCBUND_H
 #define LOCBUND_H
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 
 #if !UCONFIG_NO_FORMATTING
 
-#include "unicode/unum.h"
+#include <_foundation_unicode/unum.h>
 
 #define ULOCALEBUNDLE_NUMBERFORMAT_COUNT ((int32_t)UNUM_SPELLOUT)
 
diff --git a/icuSources/io/sprintf.cpp b/icuSources/io/sprintf.cpp
index ede31e9..8f74682 100644
--- a/icuSources/io/sprintf.cpp
+++ b/icuSources/io/sprintf.cpp
@@ -20,13 +20,13 @@
 *******************************************************************************
 */
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 
 #if !UCONFIG_NO_FORMATTING && !UCONFIG_NO_CONVERSION
 
-#include "unicode/ustdio.h"
-#include "unicode/ustring.h"
-#include "unicode/putil.h"
+#include <_foundation_unicode/ustdio.h>
+#include <_foundation_unicode/ustring.h>
+#include <_foundation_unicode/putil.h>
 
 #include "uprintf.h"
 #include "locbund.h"
diff --git a/icuSources/io/sscanf.cpp b/icuSources/io/sscanf.cpp
index 03c747c..0f4a75d 100644
--- a/icuSources/io/sscanf.cpp
+++ b/icuSources/io/sscanf.cpp
@@ -17,13 +17,13 @@
 ******************************************************************************
 */
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 
 #if !UCONFIG_NO_FORMATTING && !UCONFIG_NO_CONVERSION
 
-#include "unicode/putil.h"
-#include "unicode/ustdio.h"
-#include "unicode/ustring.h"
+#include <_foundation_unicode/putil.h>
+#include <_foundation_unicode/ustdio.h>
+#include <_foundation_unicode/ustring.h>
 #include "uscanf.h"
 #include "ufile.h"
 #include "ufmt_cmn.h"
diff --git a/icuSources/io/ucln_io.cpp b/icuSources/io/ucln_io.cpp
index cf7d88b..a8f0408 100644
--- a/icuSources/io/ucln_io.cpp
+++ b/icuSources/io/ucln_io.cpp
@@ -16,7 +16,7 @@
 *   created by: George Rhoten
 */
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 #include "mutex.h"
 #include "ucln.h"
 #include "ucln_io.h"
diff --git a/icuSources/io/ucln_io.h b/icuSources/io/ucln_io.h
index 20dcb88..b2911a5 100644
--- a/icuSources/io/ucln_io.h
+++ b/icuSources/io/ucln_io.h
@@ -19,7 +19,7 @@
 #ifndef __UCLN_IO_H__
 #define __UCLN_IO_H__
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 #include "ucln.h"
 
 /*
diff --git a/icuSources/io/ufile.cpp b/icuSources/io/ufile.cpp
index afd672f..0d3d5b8 100644
--- a/icuSources/io/ufile.cpp
+++ b/icuSources/io/ufile.cpp
@@ -20,7 +20,7 @@
 ******************************************************************************
 */
 
-#include "unicode/platform.h"
+#include <_foundation_unicode/platform.h>
 #if U_PLATFORM == U_PF_CYGWIN && defined(__STRICT_ANSI__)
 /* GCC on cygwin (not msys2) with -std=c++11 or newer has stopped defining fileno,
    unless gcc extensions are enabled (-std=gnu11).
@@ -36,18 +36,18 @@
 #endif
 
 #include "locmap.h"
-#include "unicode/ustdio.h"
+#include <_foundation_unicode/ustdio.h>
 
 #if !UCONFIG_NO_CONVERSION
 
 #include 
 
 #include "ufile.h"
-#include "unicode/uloc.h"
-#include "unicode/ures.h"
-#include "unicode/ucnv.h"
-#include "unicode/ustring.h"
-#include "unicode/unistr.h"
+#include <_foundation_unicode/uloc.h>
+#include <_foundation_unicode/ures.h>
+#include <_foundation_unicode/ucnv.h>
+#include <_foundation_unicode/ustring.h>
+#include <_foundation_unicode/unistr.h>
 #include "cstring.h"
 #include "cmemory.h"
 
diff --git a/icuSources/io/ufile.h b/icuSources/io/ufile.h
index 88fa409..00432f3 100644
--- a/icuSources/io/ufile.h
+++ b/icuSources/io/ufile.h
@@ -21,14 +21,14 @@
 #ifndef UFILE_H
 #define UFILE_H
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 
 #if !UCONFIG_NO_CONVERSION
 
 #include 
 
-#include "unicode/ucnv.h"
-#include "unicode/utrans.h"
+#include <_foundation_unicode/ucnv.h>
+#include <_foundation_unicode/utrans.h>
 #include "locbund.h"
 
 /* The buffer size for fromUnicode calls */
diff --git a/icuSources/io/ufmt_cmn.cpp b/icuSources/io/ufmt_cmn.cpp
index 9c7bedf..3d6e901 100644
--- a/icuSources/io/ufmt_cmn.cpp
+++ b/icuSources/io/ufmt_cmn.cpp
@@ -23,8 +23,8 @@
 #include "cstring.h"
 #include "cmemory.h"
 #include "ufmt_cmn.h"
-#include "unicode/uchar.h"
-#include "unicode/ucnv.h"
+#include <_foundation_unicode/uchar.h>
+#include <_foundation_unicode/ucnv.h>
 #include "ustr_cnv.h"
 
 #if !UCONFIG_NO_CONVERSION
diff --git a/icuSources/io/ufmt_cmn.h b/icuSources/io/ufmt_cmn.h
index d040fdc..8958088 100644
--- a/icuSources/io/ufmt_cmn.h
+++ b/icuSources/io/ufmt_cmn.h
@@ -22,8 +22,8 @@
 #ifndef UFMT_CMN_H
 #define UFMT_CMN_H
 
-#include "unicode/utypes.h"
-#include "unicode/utf16.h"
+#include <_foundation_unicode/utypes.h>
+#include <_foundation_unicode/utf16.h>
 
 #define UFMT_DEFAULT_BUFFER_SIZE 128
 #define MAX_UCHAR_BUFFER_SIZE(buffer) ((int32_t)(sizeof(buffer)/(U16_MAX_LENGTH*sizeof(UChar))))
diff --git a/icuSources/io/uprintf.cpp b/icuSources/io/uprintf.cpp
index 5bbe59e..f048fe1 100644
--- a/icuSources/io/uprintf.cpp
+++ b/icuSources/io/uprintf.cpp
@@ -20,15 +20,15 @@
 ******************************************************************************
 */
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 
 #if !UCONFIG_NO_FORMATTING && !UCONFIG_NO_CONVERSION
 
-#include "unicode/ustdio.h"
-#include "unicode/ustring.h"
-#include "unicode/unum.h"
-#include "unicode/udat.h"
-#include "unicode/putil.h"
+#include <_foundation_unicode/ustdio.h>
+#include <_foundation_unicode/ustring.h>
+#include <_foundation_unicode/unum.h>
+#include <_foundation_unicode/udat.h>
+#include <_foundation_unicode/putil.h>
 
 #include "cmemory.h"
 #include "locbund.h"
diff --git a/icuSources/io/uprintf.h b/icuSources/io/uprintf.h
index 0fd6066..e028641 100644
--- a/icuSources/io/uprintf.h
+++ b/icuSources/io/uprintf.h
@@ -21,11 +21,11 @@
 #ifndef UPRINTF_H
 #define UPRINTF_H
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 
 #if !UCONFIG_NO_FORMATTING
 
-#include "unicode/ustdio.h"
+#include <_foundation_unicode/ustdio.h>
 #include "ufmt_cmn.h"
 #include "locbund.h"
 
diff --git a/icuSources/io/uprntf_p.cpp b/icuSources/io/uprntf_p.cpp
index ba30fbc..d90952c 100644
--- a/icuSources/io/uprntf_p.cpp
+++ b/icuSources/io/uprntf_p.cpp
@@ -19,12 +19,12 @@
 ******************************************************************************
 */
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 
 #if !UCONFIG_NO_FORMATTING && !UCONFIG_NO_CONVERSION
 
-#include "unicode/ustring.h"
-#include "unicode/utf16.h"
+#include <_foundation_unicode/ustring.h>
+#include <_foundation_unicode/utf16.h>
 #include "uprintf.h"
 #include "ufmt_cmn.h"
 #include "cmemory.h"
diff --git a/icuSources/io/uscanf.cpp b/icuSources/io/uscanf.cpp
index ce2e47a..1bf4278 100644
--- a/icuSources/io/uscanf.cpp
+++ b/icuSources/io/uscanf.cpp
@@ -18,13 +18,13 @@
 ******************************************************************************
 */
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 
 #if !UCONFIG_NO_FORMATTING && !UCONFIG_NO_CONVERSION
 
-#include "unicode/putil.h"
-#include "unicode/ustdio.h"
-#include "unicode/ustring.h"
+#include <_foundation_unicode/putil.h>
+#include <_foundation_unicode/ustdio.h>
+#include <_foundation_unicode/ustring.h>
 #include "uscanf.h"
 #include "ufile.h"
 #include "ufmt_cmn.h"
diff --git a/icuSources/io/uscanf.h b/icuSources/io/uscanf.h
index ebb8e79..b891f1a 100644
--- a/icuSources/io/uscanf.h
+++ b/icuSources/io/uscanf.h
@@ -21,11 +21,11 @@
 #ifndef USCANF_H
 #define USCANF_H
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 
 #if !UCONFIG_NO_FORMATTING && !UCONFIG_NO_CONVERSION
 
-#include "unicode/ustdio.h"
+#include <_foundation_unicode/ustdio.h>
 
 U_CFUNC int32_t
 u_scanf_parse(UFILE     *f,
diff --git a/icuSources/io/uscanf_p.cpp b/icuSources/io/uscanf_p.cpp
index 9b27e2e..401aec3 100644
--- a/icuSources/io/uscanf_p.cpp
+++ b/icuSources/io/uscanf_p.cpp
@@ -18,15 +18,15 @@
 *******************************************************************************
 */
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 
 #if !UCONFIG_NO_FORMATTING && !UCONFIG_NO_CONVERSION
 
-#include "unicode/uchar.h"
-#include "unicode/ustring.h"
-#include "unicode/unum.h"
-#include "unicode/udat.h"
-#include "unicode/uset.h"
+#include <_foundation_unicode/uchar.h>
+#include <_foundation_unicode/ustring.h>
+#include <_foundation_unicode/unum.h>
+#include <_foundation_unicode/udat.h>
+#include <_foundation_unicode/uset.h>
 #include "uscanf.h"
 #include "ufmt_cmn.h"
 #include "ufile.h"
diff --git a/icuSources/io/ustdio.cpp b/icuSources/io/ustdio.cpp
index 502a7dc..aa2f7e4 100644
--- a/icuSources/io/ustdio.cpp
+++ b/icuSources/io/ustdio.cpp
@@ -19,17 +19,17 @@
  ******************************************************************************
  */
 
-#include "unicode/ustdio.h"
+#include <_foundation_unicode/ustdio.h>
 
 #if !UCONFIG_NO_CONVERSION
 
-#include "unicode/putil.h"
+#include <_foundation_unicode/putil.h>
 #include "cmemory.h"
 #include "cstring.h"
 #include "ufile.h"
 #include "ufmt_cmn.h"
-#include "unicode/ucnv.h"
-#include "unicode/ustring.h"
+#include <_foundation_unicode/ucnv.h>
+#include <_foundation_unicode/ustring.h>
 
 #include 
 
diff --git a/icuSources/io/ustream.cpp b/icuSources/io/ustream.cpp
index af8b369..32fb295 100644
--- a/icuSources/io/ustream.cpp
+++ b/icuSources/io/ustream.cpp
@@ -14,15 +14,15 @@
 ******************************************************************************
 */
 
-#include "unicode/utypes.h"
+#include <_foundation_unicode/utypes.h>
 
 #if !UCONFIG_NO_CONVERSION
 
-#include "unicode/uobject.h"
-#include "unicode/ustream.h"
-#include "unicode/ucnv.h"
-#include "unicode/uchar.h"
-#include "unicode/utf16.h"
+#include <_foundation_unicode/uobject.h>
+#include <_foundation_unicode/ustream.h>
+#include <_foundation_unicode/ucnv.h>
+#include <_foundation_unicode/uchar.h>
+#include <_foundation_unicode/utf16.h>
 #include "ustr_cnv.h"
 #include "cmemory.h"
 #include 
diff --git a/icuSources/stubdata/stubdata.h b/icuSources/stubdata/stubdata.h
index 9879f40..ec6ff63 100644
--- a/icuSources/stubdata/stubdata.h
+++ b/icuSources/stubdata/stubdata.h
@@ -27,9 +27,9 @@
 #ifndef __STUBDATA_H__
 #define __STUBDATA_H__
 
-#include "unicode/utypes.h"
-#include "unicode/udata.h"
-#include "unicode/uversion.h"
+#include <_foundation_unicode/utypes.h>
+#include <_foundation_unicode/udata.h>
+#include <_foundation_unicode/uversion.h>
 
 typedef struct {
     uint16_t headerSize;
diff --git a/swift/FoundationICU/FoundationICU.swift b/swift/FoundationICU/FoundationICU.swift
deleted file mode 100644
index eba3fa0..0000000
--- a/swift/FoundationICU/FoundationICU.swift
+++ /dev/null
@@ -1,15 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// This source file is part of the Swift.org open source project
-//
-// Copyright (c) 2022 Apple Inc. and the Swift project authors
-// Licensed under Apache License v2.0 with Runtime Library Exception
-//
-// See https://swift.org/LICENSE.txt for license information
-// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
-//
-//===----------------------------------------------------------------------===/
-
-@_exported import _FoundationICUCommon
-@_exported import _FoundationICUI18N
-@_exported import _FoundationICUIO