From 27072dd6446ff8a0245745af9802bfa5337f2d96 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 24 Aug 2021 11:52:08 -0400 Subject: [PATCH] Fix signature of dummy realloc() for STB_VORBIS_NO_CRT --- 1198.patch | 24 ++++++++++++++++++++++++ stb.spec | 9 ++++++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 1198.patch diff --git a/1198.patch b/1198.patch new file mode 100644 index 0000000..b94d2be --- /dev/null +++ b/1198.patch @@ -0,0 +1,24 @@ +From f9a5eaee846f1a19fbcda2f5adb5238a94cbbc2f Mon Sep 17 00:00:00 2001 +From: "Benjamin A. Beasley" +Date: Tue, 24 Aug 2021 11:45:48 -0400 +Subject: [PATCH] Fix signature of dummy realloc() for STB_VORBIS_NO_CRT + +--- + stb_vorbis.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/stb_vorbis.c b/stb_vorbis.c +index 3e5c2504c..c1703426e 100644 +--- a/stb_vorbis.c ++++ b/stb_vorbis.c +@@ -594,8 +594,8 @@ enum STBVorbisError + #else // STB_VORBIS_NO_CRT + #define NULL 0 + #define malloc(s) 0 +- #define free(s) ((void) 0) +- #define realloc(s) 0 ++ #define free(p) ((void) 0) ++ #define realloc(p, s) 0 + #endif // STB_VORBIS_NO_CRT + + #include diff --git a/stb.spec b/stb.spec index 811dc47..75f8473 100644 --- a/stb.spec +++ b/stb.spec @@ -20,7 +20,7 @@ Name: stb # https://github.com/nothings/stb/issues/359 # https://github.com/nothings/stb/issues/1101 Version: 0 -Release: 0.2.20210728git%{shortcommit}%{?dist} +Release: 0.3.20210728git%{shortcommit}%{?dist} Summary: Single-file public domain libraries for C/C++ # See LICENSE. @@ -46,6 +46,10 @@ Patch1: %{forgeurl}/pull/1195.patch # https://github.com/nothings/stb/pull/1196 Patch2: %{forgeurl}/pull/1196.patch +# Fix signature of dummy realloc() for STB_VORBIS_NO_CRT +# https://github.com/nothings/stb/pull/1198 +Patch3: %{forgeurl}/pull/1198.patch + %global stb_c_lexer_version 0.12 %global stb_connected_components_version 0.96 %global stb_divide_version 0.94 @@ -803,6 +807,9 @@ EOF %changelog +* Tue Aug 24 2021 Benjamin A. Beasley - 0-0.3.20210728git3a11740 +- Fix signature of dummy realloc() for STB_VORBIS_NO_CRT + * Mon Aug 23 2021 Benjamin A. Beasley - 0-0.2.20210728git3a11740 - Use symlinks so including "stb_foo.h" and "stb/stb_foo.h" both work