diff options
author | Werner Lemberg <wl@gnu.org> | 2006-05-02 22:22:16 +0000 |
---|---|---|
committer | Werner Lemberg <wl@gnu.org> | 2006-05-02 22:22:16 +0000 |
commit | c6afa1221a57d0d50cd9fa51f0b9e794884ef255 (patch) | |
tree | b1ec72b18a5f30540c7a07b9eac966fa79a601b2 /src/lzw/ftzopen.c | |
parent | 9482ba50b7eae7312d4eace1433de6e1d2186267 (diff) | |
download | freetype2-c6afa1221a57d0d50cd9fa51f0b9e794884ef255.tar.gz |
* include/freetype/internal/ftmemory.h: s/new/newsz/ (for C++).
(FT_ALLOC): Remove redundant redefinition.
* builds/compiler/gcc-dev.mk (CFLAGS) [g++]: Don't use
`-Wstrict-prototypes'.
* src/base/ftstream.c (FT_Stream_EnterFrame): Add cast.
Formatting, copyright years.
Diffstat (limited to 'src/lzw/ftzopen.c')
-rw-r--r-- | src/lzw/ftzopen.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lzw/ftzopen.c b/src/lzw/ftzopen.c index 1d29fd821..a9d25c5fa 100644 --- a/src/lzw/ftzopen.c +++ b/src/lzw/ftzopen.c @@ -8,7 +8,7 @@ /* be used to parse compressed PCF fonts, as found with many X11 server */ /* distributions. */ /* */ -/* Copyright 2005 by David Turner. */ +/* Copyright 2005, 2006 by David Turner. */ /* */ /* This file is part of the FreeType project, and may only be used, */ /* modified, and distributed under the terms of the FreeType project */ @@ -128,7 +128,7 @@ * */ if ( FT_REALLOC_MULT( state->prefix, old_size, new_size, - sizeof(FT_UShort)+sizeof(FT_Byte) ) ) + sizeof ( FT_UShort ) + sizeof ( FT_Byte ) ) ) return -1; /* now adjust `suffix' and move the data accordingly */ |