Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove usages of no-op POEMs (flac) #2224

Merged
merged 1 commit into from
Jan 17, 2024
Merged

Remove usages of no-op POEMs (flac) #2224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion third_party/flac/src/libFLAC/alloc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
#include <stdint.h>
#endif
#endif // STARBOARD
#include "starboard/client_porting/poem/stdio_poem.h"
#include "share/alloc.h"

#include <stdlib.h>
Expand Down
14 changes: 4 additions & 10 deletions third_party/flac/src/libFLAC/bitreader.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,11 @@
# include <config.h>
#endif

#ifndef STARBOARD
#include <stdlib.h> /* for malloc() */
#include <string.h> /* for memcpy(), memset() */
#if defined(_MSC_VER) && defined(HAVE_WINSOCK_H)
#ifdef STARBOARD
#include <netinet/in.h> /* for ntohl() */
#elif defined(_MSC_VER) && defined(HAVE_WINSOCK_H)
#include <winsock.h> /* for ntohl() */
#elif defined FLAC__SYS_DARWIN
#include <machine/endian.h> /* for ntohl() */
Expand All @@ -44,14 +46,6 @@
#else
#include <netinet/in.h> /* for ntohl() */
#endif
#else // STARBOARD
#include <netinet/in.h> /* for ntohl() */
#include "starboard/client_porting/poem/stdio_poem.h"
#include "starboard/client_porting/poem/string_poem.h"
#endif // STARBOARD

#include <stdlib.h> /* for malloc() */

#include "private/bitmath.h"
#include "private/bitreader.h"
#include "private/crc.h"
Expand Down
15 changes: 5 additions & 10 deletions third_party/flac/src/libFLAC/bitwriter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,11 @@
# include <config.h>
#endif

#ifndef STARBOARD
#if defined(_MSC_VER) && defined(HAVE_WINSOCK_H)
#include <stdlib.h> /* for malloc() */
#include <string.h> /* for memcpy(), memset() */
#ifdef STARBOARD
#include <netinet/in.h> /* for ntohl() */
#elif defined(_MSC_VER) && defined(HAVE_WINSOCK_H)
#include <winsock.h> /* for ntohl() */
#elif defined FLAC__SYS_DARWIN
#include <machine/endian.h> /* for ntohl() */
Expand All @@ -43,14 +46,6 @@
#else
#include <netinet/in.h> /* for ntohl() */
#endif
#else // STARBOARD
#include <netinet/in.h> /* for ntohl() */
#include "starboard/client_porting/poem/stdio_poem.h"
#endif // STARBOARD

#include <stdlib.h> /* for malloc() */
#include <string.h> /* for memcpy(), memset() */

#if 0 /* UNUSED */
#include "private/bitmath.h"
#endif
Expand Down
3 changes: 0 additions & 3 deletions third_party/flac/src/libFLAC/fixed.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,7 @@
#endif

#include <math.h>
#ifndef STARBOARD
#include <string.h>
#endif // STARBOARD
#include "starboard/client_porting/poem/string_poem.h"
#include "private/bitmath.h"
#include "private/fixed.h"
#include "FLAC/assert.h"
Expand Down
4 changes: 0 additions & 4 deletions third_party/flac/src/libFLAC/format.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,6 @@
#include <stdio.h>
#include <stdlib.h> /* for qsort() */
#include <string.h> /* for memset() */
#ifdef STARBOARD
#include "starboard/client_porting/poem/stdio_poem.h"
#include "starboard/client_porting/poem/string_poem.h"
#endif
#include "FLAC/assert.h"
#include "FLAC/format.h"
#include "private/format.h"
Expand Down
7 changes: 2 additions & 5 deletions third_party/flac/src/libFLAC/md5.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
# include <config.h>
#endif

#include "starboard/client_porting/poem/stdio_poem.h"
#include "starboard/client_porting/poem/string_poem.h"
#include <stdlib.h> /* for malloc() */
#include <string.h> /* for memcpy() */

#include "private/md5.h"
#include "share/alloc.h"
Expand All @@ -12,9 +12,6 @@
#define FLaC__INLINE
#endif

#include <string.h> /* for memcpy() */
#include <stdlib.h> /* for malloc() */

/*
* This code implements the MD5 message-digest algorithm.
* The algorithm is due to Ron Rivest. This code was
Expand Down
1 change: 0 additions & 1 deletion third_party/flac/src/libFLAC/memory.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
#include "private/memory.h"
#include "FLAC/assert.h"
#include "share/alloc.h"
#include "starboard/client_porting/poem/stdio_poem.h"

#include <string.h>
#include <stdlib.h>
Expand Down
8 changes: 3 additions & 5 deletions third_party/flac/src/libFLAC/stream_decoder.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,16 +42,14 @@
#include <io.h> /* for setmode(), O_BINARY */
#include <fcntl.h> /* for _O_BINARY */
#endif
#endif // STARBOARD
#include <stdio.h>
#include <stdlib.h> /* for malloc() */
#include <string.h> /* for memset/memcpy() */
#ifndef STARBOARD
#include <sys/stat.h> /* for stat() */
#include <sys/types.h> /* for off_t */
#endif // STARBOARD
#include "starboard/client_porting/poem/stdio_poem.h"
#include "starboard/client_porting/poem/string_poem.h"

#include <stdlib.h> /* for malloc() */

#if defined _MSC_VER || defined __BORLANDC__ || defined __MINGW32__
#if _MSC_VER <= 1600 || defined __BORLANDC__ /* @@@ [2G limit] */
#define fseeko fseek
Expand Down
6 changes: 3 additions & 3 deletions third_party/flac/src/libFLAC/stream_encoder.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@
#include <fcntl.h> /* for _O_BINARY */
#endif
#include <limits.h>
#endif // STARBOARD
#include <stdio.h>
#include <stdlib.h> /* for malloc() */
#include <string.h> /* for memcpy() */
#ifndef STARBOARD
#include <sys/types.h> /* for off_t */
#endif // STARBOARD
#include <stdlib.h> /* for malloc() */
#include "starboard/client_porting/poem/stdio_poem.h"
#include "starboard/client_porting/poem/string_poem.h"
#if defined _MSC_VER || defined __BORLANDC__ || defined __MINGW32__
#if _MSC_VER <= 1600 || defined __BORLANDC__ /* @@@ [2G limit] */
#define fseeko fseek
Expand Down
3 changes: 0 additions & 3 deletions third_party/flac/src/libFLAC/stream_encoder_framing.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,8 @@
# include <config.h>
#endif

#ifndef STARBOARD
#include <stdio.h>
#include <string.h> /* for strlen() */
#endif // STARBOARD
#include "starboard/client_porting/poem/string_poem.h"
#include "private/stream_encoder_framing.h"
#include "private/crc.h"
#include "FLAC/assert.h"
Expand Down
Loading