summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsuzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>2009-07-03 18:01:17 +0900
committersuzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>2009-07-03 18:01:17 +0900
commit4f9802468efb1142dc4bc629c628a32ea0cc71cc (patch)
tree585e5a1cf032f77df63064f8a24983e62e89ffbc
parent5baa5c0983ce7582380e69637b64f03a8ad710bb (diff)
downloadfreetype2-4f9802468efb1142dc4bc629c628a32ea0cc71cc.tar.gz
gzip: Distinguish PureC from TurboC on MSDOS.
-rw-r--r--ChangeLog7
-rw-r--r--src/gzip/zutil.c4
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 88d692401..36faf2921 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2009-07-03 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
+ gzip: Distinguish PureC from TurboC on MSDOS.
+
+ * src/gzip/zutil.c (zcalloc, zcfree): Enable only for
+ MSDOS platform.
+
+2009-07-03 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
+
gxvalid: Insert PureC pragma to allow unevaluated variables.
* builds/atari/ATARI.H: Insert PureC pragma not to
diff --git a/src/gzip/zutil.c b/src/gzip/zutil.c
index 0b47dd420..9d8beae3e 100644
--- a/src/gzip/zutil.c
+++ b/src/gzip/zutil.c
@@ -49,7 +49,7 @@ void zmemzero(dest, len)
}
#endif
-#ifdef __TURBOC__
+#if defined( MSDOS ) && defined( __TURBOC__ )
#if (defined( __BORLANDC__) || !defined(SMALL_MEDIUM)) && !defined(__32BIT__)
/* Small and medium model in Turbo C are for now limited to near allocation
* with reduced MAX_WBITS and MAX_MEM_LEVEL
@@ -126,7 +126,7 @@ void zcfree (voidpf opaque, voidpf ptr)
Assert(0, "zcfree: ptr not found");
}
#endif
-#endif /* __TURBOC__ */
+#endif /* MSDOS && __TURBOC__ */
#if defined(M_I86) && !defined(__32BIT__)