From 8be4b46b01cbcf7407b720571e5f455ed9fe7253 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 3 Oct 2015 00:14:05 -0700 Subject: [PATCH] xalloc: do not worry about GCC 5 warning on 32 bit * lib/xalloc.h: Revert previous change. I found a better way to fix this in coreutils. --- ChangeLog | 6 ++++++ lib/xalloc.h | 10 ---------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 116bcbae53..28016ca543 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2015-10-02 Paul Eggert + + xalloc: do not worry about GCC 5 warning on 32 bit + * lib/xalloc.h: Revert previous change. + I found a better way to fix this in coreutils. + 2015-10-02 Pádraig Brady xalloc: avoid GCC 5.1 warning on 32 bit diff --git a/lib/xalloc.h b/lib/xalloc.h index b250e2d487..81ef680a3a 100644 --- a/lib/xalloc.h +++ b/lib/xalloc.h @@ -94,12 +94,6 @@ char *xstrdup (char const *str) #define XCALLOC(n, t) \ ((t *) (sizeof (t) == 1 ? xzalloc (n) : xcalloc (n, sizeof (t)))) -/* GCC 5.1 gives an erroneous warning on 32 bit for xalloc_oversized(): - "assuming signed overflow does not occur when simplifying conditional". */ -#if (__GNUC__ == 4 && 6 <= __GNUC_MINOR__) || 4 < __GNUC__ -# pragma GCC diagnostic push -# pragma GCC diagnostic ignored "-Wstrict-overflow" -#endif /* Allocate an array of N objects, each with S bytes of memory, dynamically, with error checking. S must be nonzero. */ @@ -127,10 +121,6 @@ xnrealloc (void *p, size_t n, size_t s) return xrealloc (p, n * s); } -#if (__GNUC__ == 4 && 6 <= __GNUC_MINOR__) || 4 < __GNUC__ -# pragma GCC diagnostic pop -#endif - /* If P is null, allocate a block of at least *PN such objects; otherwise, reallocate P so that it contains more than *PN objects each of S bytes. S must be nonzero. Set *PN to the new number of -- 2.39.5