summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2016-02-09 15:24:08 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2016-02-09 15:25:58 -0800
commit812cddf3060322cc5c59b2864b206e8ddc04e6fe (patch)
tree819de1fc99e118a968994aa7ee6d12b02111c4ec
parent09ece4d341a7e07fab7be22868ebcadae8641c79 (diff)
Omit valloc decl if redundant
* src/gmalloc.c (valloc): Omit decl if malloc.h is included, to pacify --enable-gcc-warnings.
-rw-r--r--src/gmalloc.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/gmalloc.c b/src/gmalloc.c
index dd18293dc7..d795c13f61 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;