diff options
| author | Rosen Penev <rosenp@gmail.com> | 2021-03-03 18:00:26 -0800 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-11-07 19:49:57 +0100 |
| commit | b9f866825f49cc70ea3c3d42bbf2513ed604c56b (patch) | |
| tree | 5ba49290c81e972626d36305e12ae46ab8c8a7e5 /tools/m4/patches/001-fix-macos-vasnprintf.patch | |
| parent | 662fe6a6eeede98ef215284aeb5ff8256ee25f1d (diff) | |
| download | upstream-b9f866825f49cc70ea3c3d42bbf2513ed604c56b.tar.gz upstream-b9f866825f49cc70ea3c3d42bbf2513ed604c56b.tar.bz2 upstream-b9f866825f49cc70ea3c3d42bbf2513ed604c56b.zip | |
tools/m4: update to 1.4.19
Remove upstreamed patches.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry picked from commit fc9682ed3961e098ace708ca1ca41c2239a4e2ee)
Diffstat (limited to 'tools/m4/patches/001-fix-macos-vasnprintf.patch')
| -rw-r--r-- | tools/m4/patches/001-fix-macos-vasnprintf.patch | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/tools/m4/patches/001-fix-macos-vasnprintf.patch b/tools/m4/patches/001-fix-macos-vasnprintf.patch deleted file mode 100644 index e41315d34e..0000000000 --- a/tools/m4/patches/001-fix-macos-vasnprintf.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/lib/vasnprintf.c -+++ b/lib/vasnprintf.c -@@ -4858,7 +4858,11 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t * - #endif - *fbp = dp->conversion; - #if USE_SNPRINTF --# if !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) -+# if ! (((__GLIBC__ > 2 \ -+ || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) \ -+ && !defined __UCLIBC__) \ -+ || (defined __APPLE__ && defined __MACH__) \ -+ || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) - fbp[1] = '%'; - fbp[2] = 'n'; - fbp[3] = '\0'; -@@ -4872,6 +4876,9 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t * - in format strings in writable memory may crash the program - (if compiled with _FORTIFY_SOURCE=2), so we should avoid it - in this situation. */ -+ /* macOS 10.13 High Sierra behaves like glibc with -+ _FORTIFY_SOURCE=2, and older macOS releases -+ presumably do not need %n. */ - /* On native Windows systems (such as mingw), we can avoid using - %n because: - - Although the gl_SNPRINTF_TRUNCATION_C99 test fails, |