diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-04-30 21:45:51 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-04-30 21:45:51 +0000 |
| commit | 5cbeb59475d2d25a86ac936e47c99be86e0a3183 (patch) | |
| tree | b84cfa6aa252b33d133ceb0922061367ca5ac637 /icu4c/source/test/intltest/citrtest.cpp | |
| parent | eb3451793aaf42870e44281708ccac51c010e837 (diff) | |
| parent | 627758a905bdac685d065ed3de08e628b03b70b4 (diff) | |
| download | icu-5cbeb59475d2d25a86ac936e47c99be86e0a3183.tar.gz | |
Snap for 11784721 from 627758a905bdac685d065ed3de08e628b03b70b4 to build-tools-release
Change-Id: I48be0d30274e0df643635f86bc40c5a9de1e52ad
Diffstat (limited to 'icu4c/source/test/intltest/citrtest.cpp')
| -rw-r--r-- | icu4c/source/test/intltest/citrtest.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/icu4c/source/test/intltest/citrtest.cpp b/icu4c/source/test/intltest/citrtest.cpp index 5ca90dd33..332d02724 100644 --- a/icu4c/source/test/intltest/citrtest.cpp +++ b/icu4c/source/test/intltest/citrtest.cpp @@ -101,6 +101,11 @@ public: return pos; } + +#ifdef move32 + // One of the system headers right now is sometimes defining a conflicting macro we don't use +#undef move32 +#endif virtual int32_t move32(int32_t delta, CharacterIterator::EOrigin origin) override { switch(origin) { case kStart: |