[Emacs-diffs] master 812cddf 2/2: Omit valloc decl if redundant

[Paul Eggert]

branch: master
commit 812cddf3060322cc5c59b2864b206e8ddc04e6fe
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    Omit valloc decl if redundant
    
    * src/gmalloc.c (valloc): Omit decl if malloc.h is included,
    to pacify --enable-gcc-warnings.
---
 src/gmalloc.c |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/gmalloc.c b/src/gmalloc.c
index dd18293..d795c13 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;