summaryrefslogtreecommitdiff
path: root/src/gzip
diff options
context:
space:
mode:
authorDavid Turner <david@freetype.org>2006-01-27 12:11:22 +0000
committerDavid Turner <david@freetype.org>2006-01-27 12:11:22 +0000
commit6a681fa84a0ba1164726cedfc3623d84f1e3d60a (patch)
tree9a37cda39d61769041249a403808d915c7124f9d /src/gzip
parent97c64185603a94d8251255a4325d2464aad72918 (diff)
downloadfreetype2-6a681fa84a0ba1164726cedfc3623d84f1e3d60a.tar.gz
* src/autofit/afwarp.c: simple #ifdef to prevent compilation when
the warp hinter isn't active (it shouldn't, still experimental) * Jamfile, include/freetype/config/ftmodule.h: removed "gxvalid" and "otvalid" from the list of modules that are linked statically to a given FreeType library. Functionality has been moved to the "ftvalid" CVS module. note also that current Make-based build system still compiles the modules though... * include/freetype/config/ftoption.h: added FT_STRICT_ALIASING, which controls the definitions of the memory management functions to avoid warnings with recent versions of GCC. this macro is only here to be disabled, in case we detect problems with the new scheme. NOTE: disable macro to use the memory debugger. this will be fixed later !!
Diffstat (limited to 'src/gzip')
-rw-r--r--src/gzip/ftgzip.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gzip/ftgzip.c b/src/gzip/ftgzip.c
index 67e7bb8f0..bfbcbf9e1 100644
--- a/src/gzip/ftgzip.c
+++ b/src/gzip/ftgzip.c
@@ -99,12 +99,12 @@
uInt size )
{
FT_ULong sz = (FT_ULong)size * items;
+ FT_Error error;
FT_Pointer p;
- FT_MEM_ALLOC( p, sz );
-
- return (voidpf) p;
+ (void)FT_ALLOC( p, sz );
+ return p;
}