From 1c7050f1b9b88429baca91ff4433c8ffe8468448 Mon Sep 17 00:00:00 2001
From: Garo Bournoutian <gbournou@google.com>
Date: Wed, 17 Jan 2024 00:04:18 -0800
Subject: [PATCH] Remove usages of no-op POEMs (zlib)

- stdio_poem, string_poem, strings_poem, wchar_poem

b/307941391
---
 third_party/zlib/contrib/minizip/unzip.c         | 1 -
 third_party/zlib/contrib/minizip/zip.c           | 4 +---
 third_party/zlib/contrib/optimizations/inflate.c | 4 ----
 third_party/zlib/crc_folding.c                   | 4 ----
 third_party/zlib/google/compression_utils.cc     | 4 ----
 third_party/zlib/google/zip_internal.cc          | 5 -----
 6 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/third_party/zlib/contrib/minizip/unzip.c b/third_party/zlib/contrib/minizip/unzip.c
index 44d0ed2a4991..ca1758a75235 100644
--- a/third_party/zlib/contrib/minizip/unzip.c
+++ b/third_party/zlib/contrib/minizip/unzip.c
@@ -83,7 +83,6 @@
 #endif
 
 #if defined(STARBOARD)
-#include "starboard/client_porting/poem/stdio_poem.h"
 #include "third_party/zlib/contrib/minizip/iostarboard.h"
 #endif
 
diff --git a/third_party/zlib/contrib/minizip/zip.c b/third_party/zlib/contrib/minizip/zip.c
index f23b7a026eaa..f56eb81e2fbd 100644
--- a/third_party/zlib/contrib/minizip/zip.c
+++ b/third_party/zlib/contrib/minizip/zip.c
@@ -25,6 +25,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 #if defined(USE_SYSTEM_ZLIB)
 #include <zlib.h>
 #else
@@ -45,10 +46,7 @@
 
 #if defined(STARBOARD)
 #include "starboard/client_porting/poem/eztime_poem.h"
-#include "starboard/client_porting/poem/stdio_poem.h"
 #include "third_party/zlib/contrib/minizip/iostarboard.h"
-#else
-#include <time.h>
 #endif
 
 
diff --git a/third_party/zlib/contrib/optimizations/inflate.c b/third_party/zlib/contrib/optimizations/inflate.c
index a7f868312cee..3c45fbea7580 100644
--- a/third_party/zlib/contrib/optimizations/inflate.c
+++ b/third_party/zlib/contrib/optimizations/inflate.c
@@ -86,10 +86,6 @@
 #include "contrib/optimizations/inffast_chunk.h"
 #include "contrib/optimizations/chunkcopy.h"
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/string_poem.h"
-#endif
-
 #ifdef MAKEFIXED
 #  ifndef BUILDFIXED
 #    define BUILDFIXED
diff --git a/third_party/zlib/crc_folding.c b/third_party/zlib/crc_folding.c
index cd17c16a40f5..48d77744aaf4 100644
--- a/third_party/zlib/crc_folding.c
+++ b/third_party/zlib/crc_folding.c
@@ -23,10 +23,6 @@
 #include <immintrin.h>
 #include <wmmintrin.h>
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/string_poem.h"
-#endif
-
 #define CRC_LOAD(s) \
     do { \
         __m128i xmm_crc0 = _mm_loadu_si128((__m128i *)s->crc0 + 0);\
diff --git a/third_party/zlib/google/compression_utils.cc b/third_party/zlib/google/compression_utils.cc
index 7cbe23ae3e26..9f63a840167d 100644
--- a/third_party/zlib/google/compression_utils.cc
+++ b/third_party/zlib/google/compression_utils.cc
@@ -12,10 +12,6 @@
 
 #include "third_party/zlib/google/compression_utils_portable.h"
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/stdio_poem.h"
-#endif
-
 namespace compression {
 
 bool GzipCompress(base::StringPiece input,
diff --git a/third_party/zlib/google/zip_internal.cc b/third_party/zlib/google/zip_internal.cc
index 953e3482f3ac..cc30b1b753dd 100644
--- a/third_party/zlib/google/zip_internal.cc
+++ b/third_party/zlib/google/zip_internal.cc
@@ -27,11 +27,6 @@
 #endif  // defined(OS_POSIX)
 #endif  // defined(USE_SYSTEM_MINIZIP)
 
-#if defined(STARBOARD)
-#include "starboard/client_porting/poem/stdio_poem.h"
-#include "starboard/client_porting/poem/string_poem.h"
-#endif
-
 namespace {
 
 #if defined(OS_WIN)