diff options
| author | scuri <scuri> | 2009-10-20 17:20:18 +0000 |
|---|---|---|
| committer | scuri <scuri> | 2009-10-20 17:20:18 +0000 |
| commit | 27a4f9c4ac45ff65f941964f7351b64b1e6a9f35 (patch) | |
| tree | 2f68c5d9ce5bf6cbc320ac17aef0a65a3ceb99a1 /src/freetype2/gzip/zutil.c | |
| parent | 2b70507615b2611fce4294c65bec7264644e2665 (diff) | |
*** empty log message ***
Diffstat (limited to 'src/freetype2/gzip/zutil.c')
| -rw-r--r-- | src/freetype2/gzip/zutil.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/freetype2/gzip/zutil.c b/src/freetype2/gzip/zutil.c index bbb9506..131d280 100644 --- a/src/freetype2/gzip/zutil.c +++ b/src/freetype2/gzip/zutil.c @@ -3,7 +3,7 @@ * For conditions of distribution and use, see copyright notice in zlib.h */ -/* @(#) $Id: zutil.c,v 1.1 2008/10/17 06:10:37 scuri Exp $ */ +/* @(#) $Id: zutil.c,v 1.2 2009/10/20 17:20:25 scuri Exp $ */ #include "zutil.h" @@ -49,7 +49,7 @@ void zmemzero(dest, len) } #endif -#ifdef __TURBOC__ +#if defined( MSDOS ) && defined( __TURBOC__ ) && !defined( MY_ZCALLOC ) #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,10 +126,10 @@ void zcfree (voidpf opaque, voidpf ptr) Assert(0, "zcfree: ptr not found"); } #endif -#endif /* __TURBOC__ */ +#endif /* MSDOS && __TURBOC__ */ -#if defined(M_I86) && !defined(__32BIT__) +#if defined(M_I86) && !defined(__32BIT__) && !defined( MY_ZCALLOC ) /* Microsoft C in 16-bit mode */ # define MY_ZCALLOC |