Clean up Starboardizations from ICU (#3866)

Removes a lot of obsolete POEM headers and revert some upstream diff noise. Test-On-Device: true b/120914834 b/189235009
youtube · Jul 22, 2024 · 75e2941 · 75e2941
1 parent 1b146e7
commit 75e2941
Show file tree

Hide file tree

Showing 141 changed files with 10 additions and 420 deletions.
diff --git a/third_party/icu/source/common/bmpset.cpp b/third_party/icu/source/common/bmpset.cpp
@@ -16,9 +16,6 @@
 *   created by: Markus W. Scherer
 */
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/utypes.h"
 #include "unicode/uniset.h"
 #include "unicode/utf8.h"

diff --git a/third_party/icu/source/common/brkiter.cpp b/third_party/icu/source/common/brkiter.cpp
@@ -24,9 +24,6 @@
 
 #if !UCONFIG_NO_BREAK_ITERATION
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/rbbi.h"
 #include "unicode/brkiter.h"
 #include "unicode/udata.h"

diff --git a/third_party/icu/source/common/bytestrie.cpp b/third_party/icu/source/common/bytestrie.cpp
@@ -14,9 +14,6 @@
 *   created by: Markus W. Scherer
 */
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/utypes.h"
 #include "unicode/bytestream.h"
 #include "unicode/bytestrie.h"

diff --git a/third_party/icu/source/common/bytestriebuilder.cpp b/third_party/icu/source/common/bytestriebuilder.cpp
@@ -14,9 +14,6 @@
 *   created by: Markus W. Scherer
 */
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/utypes.h"
 #include "unicode/bytestrie.h"
 #include "unicode/bytestriebuilder.h"

diff --git a/third_party/icu/source/common/bytestrieiterator.cpp b/third_party/icu/source/common/bytestrieiterator.cpp
@@ -14,9 +14,6 @@
 *   created by: Markus W. Scherer
 */
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/utypes.h"
 #include "unicode/bytestrie.h"
 #include "unicode/stringpiece.h"

diff --git a/third_party/icu/source/common/cmemory.cpp b/third_party/icu/source/common/cmemory.cpp
@@ -20,9 +20,6 @@
 *
 ******************************************************************************
 */
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/uclean.h"
 #include "cmemory.h"
 #include "putilimp.h"

diff --git a/third_party/icu/source/common/cmemory.h b/third_party/icu/source/common/cmemory.h
@@ -28,9 +28,6 @@
 
 #include "unicode/utypes.h"
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif
 #include <stddef.h>
 #include <string.h>
 #include "unicode/localpointer.h"

diff --git a/third_party/icu/source/common/cstring.cpp b/third_party/icu/source/common/cstring.cpp
@@ -22,13 +22,9 @@
 */
 
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#else
-#include <stdio.h>
-#endif
 
 #include <stdlib.h>
+#include <stdio.h>
 #include "unicode/utypes.h"
 #include "cmemory.h"
 #include "cstring.h"

diff --git a/third_party/icu/source/common/cwchar.h b/third_party/icu/source/common/cwchar.h
@@ -23,10 +23,8 @@
 #ifndef __CWCHAR_H__
 #define __CWCHAR_H__
 
-#if !defined(STARBOARD)
 #include <string.h>
 #include <stdlib.h>
-#endif
 #include "unicode/utypes.h"
 
 /* Do this after utypes.h so that we have U_HAVE_WCHAR_H . */

diff --git a/third_party/icu/source/common/dictbe.cpp b/third_party/icu/source/common/dictbe.cpp
@@ -13,9 +13,6 @@
 
 #if !UCONFIG_NO_BREAK_ITERATION
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "brkeng.h"
 #include "dictbe.h"
 #include "unicode/uniset.h"

diff --git a/third_party/icu/source/common/loadednormalizer2impl.cpp b/third_party/icu/source/common/loadednormalizer2impl.cpp
@@ -15,9 +15,6 @@
 
 #if !UCONFIG_NO_NORMALIZATION
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/udata.h"
 #include "unicode/localpointer.h"
 #include "unicode/normalizer2.h"

diff --git a/third_party/icu/source/common/locavailable.cpp b/third_party/icu/source/common/locavailable.cpp
@@ -19,9 +19,6 @@
 *   that then do not depend on resource bundle code and res_index bundles.
 */
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/errorcode.h"
 #include "unicode/utypes.h"
 #include "unicode/locid.h"

diff --git a/third_party/icu/source/common/locid.cpp b/third_party/icu/source/common/locid.cpp
@@ -31,10 +31,6 @@
 ******************************************************************************
 */
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
-
 #include <utility>
 
 #include "unicode/bytestream.h"

diff --git a/third_party/icu/source/common/locutil.cpp b/third_party/icu/source/common/locutil.cpp
@@ -10,9 +10,6 @@
 
 #if !UCONFIG_NO_SERVICE || !UCONFIG_NO_TRANSLITERATION
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/resbund.h"
 #include "unicode/uenum.h"
 #include "cmemory.h"

diff --git a/third_party/icu/source/common/messagepattern.cpp b/third_party/icu/source/common/messagepattern.cpp
@@ -18,9 +18,6 @@
 
 #if !UCONFIG_NO_FORMATTING
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/messagepattern.h"
 #include "unicode/unistr.h"
 #include "unicode/utf16.h"

diff --git a/third_party/icu/source/common/normalizer2impl.cpp b/third_party/icu/source/common/normalizer2impl.cpp
@@ -22,9 +22,6 @@
 
 #if !UCONFIG_NO_NORMALIZATION
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/bytestream.h"
 #include "unicode/edits.h"
 #include "unicode/normalizer2.h"

diff --git a/third_party/icu/source/common/propsvec.cpp b/third_party/icu/source/common/propsvec.cpp
@@ -18,9 +18,6 @@
 *   Store bits (Unicode character properties) in bit set vectors.
 */
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include <stdlib.h>
 #include "unicode/utypes.h"
 #include "cmemory.h"

diff --git a/third_party/icu/source/common/punycode.cpp b/third_party/icu/source/common/punycode.cpp
@@ -44,9 +44,6 @@ Disclaimer and license
  * - UTF-16 handling
  */
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/utypes.h"
 
 #if !UCONFIG_NO_IDNA

diff --git a/third_party/icu/source/common/putil.cpp b/third_party/icu/source/common/putil.cpp
@@ -39,12 +39,6 @@
 ******************************************************************************
 */
 
-// Starboard poems must be included before uposixdefs.h, or else they cause
-// compiler errors on some platforms.
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
-
 // Defines _XOPEN_SOURCE for access to POSIX functions.
 // Must be before any other #includes.
 #include "uposixdefs.h"

diff --git a/third_party/icu/source/common/rbbi.cpp b/third_party/icu/source/common/rbbi.cpp
@@ -18,10 +18,6 @@
 
 #if !UCONFIG_NO_BREAK_ITERATION
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
-
 #include <cinttypes>
 
 #include "unicode/rbbi.h"

diff --git a/third_party/icu/source/common/rbbidata.cpp b/third_party/icu/source/common/rbbidata.cpp
@@ -11,9 +11,6 @@
 
 #if !UCONFIG_NO_BREAK_ITERATION
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/ucptrie.h"
 #include "unicode/utypes.h"
 #include "rbbidata.h"

diff --git a/third_party/icu/source/common/rbbinode.cpp b/third_party/icu/source/common/rbbinode.cpp
@@ -21,9 +21,6 @@
 
 #if !UCONFIG_NO_BREAK_ITERATION
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/unistr.h"
 #include "unicode/uniset.h"
 #include "unicode/uchar.h"

diff --git a/third_party/icu/source/common/rbbiscan.cpp b/third_party/icu/source/common/rbbiscan.cpp
@@ -18,9 +18,6 @@
 
 #if !UCONFIG_NO_BREAK_ITERATION
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/unistr.h"
 #include "unicode/uniset.h"
 #include "unicode/uchar.h"

diff --git a/third_party/icu/source/common/rbbisetb.cpp b/third_party/icu/source/common/rbbisetb.cpp
@@ -34,9 +34,6 @@
 
 #if !UCONFIG_NO_BREAK_ITERATION
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/uniset.h"
 #include "uvector.h"
 #include "uassert.h"

diff --git a/third_party/icu/source/common/rbbitblb.cpp b/third_party/icu/source/common/rbbitblb.cpp
@@ -15,9 +15,6 @@
 
 #if !UCONFIG_NO_BREAK_ITERATION
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/unistr.h"
 #include "rbbitblb.h"
 #include "rbbirb.h"

diff --git a/third_party/icu/source/common/sharedobject.cpp b/third_party/icu/source/common/sharedobject.cpp
@@ -7,9 +7,6 @@
 ******************************************************************************
 * sharedobject.cpp
 */
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "sharedobject.h"
 #include "mutex.h"
 #include "uassert.h"

diff --git a/third_party/icu/source/common/stringtriebuilder.cpp b/third_party/icu/source/common/stringtriebuilder.cpp
@@ -14,9 +14,6 @@
 *   created by: Markus W. Scherer
 */
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "utypeinfo.h"  // for 'typeid' to work
 #include "unicode/utypes.h"
 #include "unicode/stringtriebuilder.h"

diff --git a/third_party/icu/source/common/uassert.h b/third_party/icu/source/common/uassert.h
@@ -32,9 +32,7 @@
 #include "starboard/configuration.h"
 #endif  // defined(STARBOARD)
 #if U_DEBUG
-#if !defined(STARBOARD)
 #   include <assert.h>
-#endif
 #   define U_ASSERT(exp) assert(exp)
 #elif U_CPLUSPLUS_VERSION
 #   define U_ASSERT(exp) (void)0

diff --git a/third_party/icu/source/common/ubidi.cpp b/third_party/icu/source/common/ubidi.cpp
@@ -17,9 +17,6 @@
 *
 */
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "cmemory.h"
 #include "unicode/utypes.h"
 #include "unicode/ustring.h"

diff --git a/third_party/icu/source/common/ubidiln.cpp b/third_party/icu/source/common/ubidiln.cpp
@@ -16,9 +16,6 @@
 *   created by: Markus W. Scherer, updated by Matitiahu Allouche
 */
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "cmemory.h"
 #include "unicode/utypes.h"
 #include "unicode/ustring.h"

diff --git a/third_party/icu/source/common/uchar.cpp b/third_party/icu/source/common/uchar.cpp
@@ -21,9 +21,6 @@
 ******************************************************************************
 */
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/utypes.h"
 #include "unicode/uchar.h"
 #include "unicode/uscript.h"

diff --git a/third_party/icu/source/common/ucharstriebuilder.cpp b/third_party/icu/source/common/ucharstriebuilder.cpp
@@ -14,9 +14,6 @@
 *   created by: Markus W. Scherer
 */
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/utypes.h"
 #include "unicode/ucharstrie.h"
 #include "unicode/ucharstriebuilder.h"

diff --git a/third_party/icu/source/common/ucharstrieiterator.cpp b/third_party/icu/source/common/ucharstrieiterator.cpp
@@ -14,9 +14,6 @@
 *   created by: Markus W. Scherer
 */
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/utypes.h"
 #include "unicode/ucharstrie.h"
 #include "unicode/unistr.h"

diff --git a/third_party/icu/source/common/ucln_cmn.cpp b/third_party/icu/source/common/ucln_cmn.cpp
@@ -14,9 +14,6 @@
 *   created by: George Rhoten
 */
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/utypes.h"
 #include "unicode/uclean.h"
 #include "cmemory.h"

diff --git a/third_party/icu/source/common/ucln_imp.h b/third_party/icu/source/common/ucln_imp.h
@@ -21,9 +21,7 @@
 #define __UCLN_IMP_H__
 
 #include "ucln.h"
-#if !defined(STARBOARD)
 #include <stdlib.h>
-#endif
 
 /**
  * Auto cleanup of ICU libraries

diff --git a/third_party/icu/source/common/ucnv.cpp b/third_party/icu/source/common/ucnv.cpp
@@ -21,9 +21,6 @@
 *   06/20/2000  helena      OS/400 port changes; mostly typecast.
 */
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/utypes.h"
 
 #if !UCONFIG_NO_CONVERSION

diff --git a/third_party/icu/source/common/ucnv_bld.cpp b/third_party/icu/source/common/ucnv_bld.cpp
@@ -25,9 +25,6 @@
 
 #if !UCONFIG_NO_CONVERSION
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/putil.h"
 #include "unicode/udata.h"
 #include "unicode/ucnv.h"

diff --git a/third_party/icu/source/common/ucnv_ext.cpp b/third_party/icu/source/common/ucnv_ext.cpp
@@ -22,9 +22,6 @@
 
 #if !UCONFIG_NO_CONVERSION && !UCONFIG_NO_LEGACY_CONVERSION
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/assert_poem.h"
-#endif  // defined(STARBOARD)
 #include "unicode/uset.h"
 #include "unicode/ustring.h"
 #include "ucnv_bld.h"