From ae3736fc28a704c17c69d460531c4973e83428cd Mon Sep 17 00:00:00 2001
From: Stas Degteff <stas_degteff@users.sourceforge.net>
Date: Sat, 14 Jan 2006 22:11:56 +0000
Subject: [PATCH] Try to build Golded+ in MacOSX

---
 goldlib/gall/gdefs.h | 2 ++
 goldlib/smblib/lzh.c | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/goldlib/gall/gdefs.h b/goldlib/gall/gdefs.h
index a372823..2aae0de 100644
--- a/goldlib/gall/gdefs.h
+++ b/goldlib/gall/gdefs.h
@@ -138,10 +138,12 @@ typedef unsigned char  uint8_t;
 typedef unsigned short uint16_t;
 typedef unsigned int   uint32_t;
 
+#if !defined(__APPLE__)
 typedef   signed char   int8_t;
 typedef   signed short  int16_t;
 typedef   signed int    int32_t;
 #endif
+#endif
 
 typedef uint8_t   byte;
 typedef uint16_t  word;
diff --git a/goldlib/smblib/lzh.c b/goldlib/smblib/lzh.c
index dd912da..0484356 100644
--- a/goldlib/smblib/lzh.c
+++ b/goldlib/smblib/lzh.c
@@ -37,7 +37,7 @@
 
 /* FreeBSD's malloc.h is deprecated, it drops a warning and */
 /* #includes <stdlib.h>, which is already here.             */
-#ifndef __FreeBSD__
+#if !defined(__FreeBSD__) && !defined(__APPLE__)
 #include <malloc.h>
 #endif
 
@@ -448,10 +448,10 @@ void lzh_reconst(void)
         for (k = j - 1; f < lzh_freq[k]; k--);
         k++;
         l = (j - k) * 2;
-        
+
         /* movmem() is Turbo-C dependent
            rewritten to memmove() by Kenji */
-        
+
         /* movmem(&lzh_freq[k], &lzh_freq[k + 1], l); */
         (void)memmove(lzh_freq+k+1,lzh_freq+k, l);
         lzh_freq[k] = f;