From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 9 Feb 2016 23:24:08 +0000 (-0800)
Subject: Omit valloc decl if redundant
X-Git-Tag: emacs-26.0.90~2674
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=812cddf3060322cc5c59b2864b206e8ddc04e6fe;p=emacs.git

Omit valloc decl if redundant

* src/gmalloc.c (valloc): Omit decl if malloc.h is included,
to pacify --enable-gcc-warnings.
---

diff --git a/src/gmalloc.c b/src/gmalloc.c
index dd18293dc7e..d795c13f616 100644
--- a/src/gmalloc.c
+++ b/src/gmalloc.c
@@ -1683,14 +1683,17 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
    or (US mail) as Mike Haertel c/o Free Software Foundation.  */
 
 #ifndef HYBRID_MALLOC
+
+# ifndef HAVE_MALLOC_H
 /* Allocate SIZE bytes on a page boundary.  */
 extern void *valloc (size_t);
+# endif
 
-#if defined _SC_PAGESIZE || !defined HAVE_GETPAGESIZE
-# include "getpagesize.h"
-#elif !defined getpagesize
+# if defined _SC_PAGESIZE || !defined HAVE_GETPAGESIZE
+#  include "getpagesize.h"
+# elif !defined getpagesize
 extern int getpagesize (void);
-#endif
+# endif
 
 static size_t pagesize;