From deda2c0fd8689349fea2a900199a76ff7ecb319e Mon Sep 17 00:00:00 2001
From: Bryan Newbold <bnewbold@robocracy.org>
Date: Mon, 20 Feb 2017 00:05:26 -0800
Subject: Import Upstream version 5d6

---
 gmalloc.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'gmalloc.c')

diff --git a/gmalloc.c b/gmalloc.c
index f16882d..b9b5e1e 100644
--- a/gmalloc.c
+++ b/gmalloc.c
@@ -1622,11 +1622,13 @@ write to the Free Software Foundation, Inc., 59 Temple Place, Suite
 extern size_t __getpagesize PP ((void));
 #endif
 #else
+#ifndef __osf__			/* declared in <unistd.h> */
 #ifndef hpux			/* declared in <unistd.h> */
 #ifndef __svr4__		/* declared in <unistd.h> */
 #include "getpagesize.h"
 #endif
 #endif
+#endif
 #define	 __getpagesize()	getpagesize()
 #endif
 
@@ -1649,6 +1651,7 @@ valloc (size)
 
 #endif	/* Not ELIDE_VALLOC.  */
 
+#ifdef DEBUG_GMALLOC
 /* Debugging functions added by Radey Shouman */
 struct list *check_block_prev;
 int check_block(block, cont)
@@ -1697,4 +1700,4 @@ int check_frag_blocks()
     }
   return 0;
 }
-
+#endif
-- 
cgit v1.2.3