? builds/unix/aclocal.m4 ? builds/unix/autom4te.cache ? builds/unix/config.guess ? builds/unix/config.sub ? builds/unix/configure ? builds/unix/ltmain.sh Index: ChangeLog =================================================================== RCS file: /cvsroot/freetype/freetype2/ChangeLog,v retrieving revision 1.1044 diff -u -p -r1.1044 ChangeLog --- ChangeLog 22 May 2005 20:46:39 -0000 1.1044 +++ ChangeLog 23 May 2005 01:31:00 -0000 @@ -1,3 +1,16 @@ +2005-05-23 Behdad Esfahbod + * configure.ac: Do not add -fno-strict-aliasing to CFLAGS. + We do not need it anymore. + + * include/freetype/cache/ftccache.h, include/freetype/cache/ftcmru.h: + Remove cast on lvalue, use a temporary pointer instead. + + * include/freetype/cache/ftcmru.h, include/freetype/internal/ftmemory.h, + src/base/ftglyph.c: Cast to (void*) temporarily to not break + strict-aliasing. + + * src/base/ftinit.c (FT_USE_MODULE): Wrong type information fixed. + 2005-05-22 Werner Lemberg * src/base/ftrfork.c (raccess_guess_apple_generic): Mark Index: builds/unix/configure.ac =================================================================== RCS file: /cvsroot/freetype/freetype2/builds/unix/configure.ac,v retrieving revision 1.28 diff -u -p -r1.28 configure.ac --- builds/unix/configure.ac 17 Nov 2004 08:19:26 -0000 1.28 +++ builds/unix/configure.ac 23 May 2005 01:31:00 -0000 @@ -28,7 +28,7 @@ AC_PROG_CPP # get compiler flags right if test "x$CC" = xgcc; then - XX_CFLAGS="-Wall -fno-strict-aliasing" + XX_CFLAGS="-Wall" XX_ANSIFLAGS="-pedantic -ansi" else case "$host" in Index: include/freetype/cache/ftccache.h =================================================================== RCS file: /cvsroot/freetype/freetype2/include/freetype/cache/ftccache.h,v retrieving revision 1.18 diff -u -p -r1.18 ftccache.h --- include/freetype/cache/ftccache.h 5 Feb 2004 14:36:43 -0000 1.18 +++ include/freetype/cache/ftccache.h 23 May 2005 01:31:00 -0000 @@ -248,7 +248,8 @@ FT_BEGIN_HEADER error = FTC_Cache_NewNode( _cache, _hash, query, &_node ); \ \ _Ok: \ - *(FTC_Node*)&(node) = _node; \ + _pnode = (FTC_Node*)(void*)&(node); \ + *_pnode = _node; \ FT_END_STMNT #else /* !FTC_INLINE */ Index: include/freetype/cache/ftcmru.h =================================================================== RCS file: /cvsroot/freetype/freetype2/include/freetype/cache/ftcmru.h,v retrieving revision 1.9 diff -u -p -r1.9 ftcmru.h --- include/freetype/cache/ftcmru.h 9 Jun 2004 21:07:49 -0000 1.9 +++ include/freetype/cache/ftcmru.h 23 May 2005 01:31:00 -0000 @@ -172,7 +172,7 @@ FT_BEGIN_HEADER FT_BEGIN_STMNT \ FTC_MruNode* _pfirst = &(list)->nodes; \ FTC_MruNode_CompareFunc _compare = (FTC_MruNode_CompareFunc)(compare); \ - FTC_MruNode _first, _node; \ + FTC_MruNode _first, _node, *_pnode; \ \ \ error = 0; \ @@ -189,7 +189,8 @@ FT_BEGIN_HEADER if ( _node != _first ) \ FTC_MruNode_Up( _pfirst, _node ); \ \ - *(FTC_MruNode*)&(node) = _node; \ + _pnode = (FTC_MruNode*)(void*)&(node); \ + *_pnode = _node; \ goto _MruOk; \ } \ _node = _node->next; \ @@ -197,7 +198,7 @@ FT_BEGIN_HEADER } while ( _node != _first) ; \ } \ \ - error = FTC_MruList_New( (list), (key), (FTC_MruNode*)&(node) ); \ + error = FTC_MruList_New( (list), (key), (FTC_MruNode*)(void*)&(node) ); \ _MruOk: \ ; \ FT_END_STMNT Index: include/freetype/internal/ftmemory.h =================================================================== RCS file: /cvsroot/freetype/freetype2/include/freetype/internal/ftmemory.h,v retrieving revision 1.38 diff -u -p -r1.38 ftmemory.h --- include/freetype/internal/ftmemory.h 16 Mar 2005 01:49:54 -0000 1.38 +++ include/freetype/internal/ftmemory.h 23 May 2005 01:31:01 -0000 @@ -292,41 +292,41 @@ FT_BEGIN_HEADER #define FT_MEM_ALLOC( _pointer_, _size_ ) \ FT_Alloc_Debug( memory, _size_, \ - (void**)&(_pointer_), __FILE__, __LINE__ ) + (void**)(void*)&(_pointer_), __FILE__, __LINE__ ) #define FT_MEM_REALLOC( _pointer_, _current_, _size_ ) \ FT_Realloc_Debug( memory, _current_, _size_, \ - (void**)&(_pointer_), __FILE__, __LINE__ ) + (void**)(void*)&(_pointer_), __FILE__, __LINE__ ) #define FT_MEM_QALLOC( _pointer_, _size_ ) \ FT_QAlloc_Debug( memory, _size_, \ - (void**)&(_pointer_), __FILE__, __LINE__ ) + (void**)(void*)&(_pointer_), __FILE__, __LINE__ ) #define FT_MEM_QREALLOC( _pointer_, _current_, _size_ ) \ FT_QRealloc_Debug( memory, _current_, _size_, \ - (void**)&(_pointer_), __FILE__, __LINE__ ) + (void**)(void*)&(_pointer_), __FILE__, __LINE__ ) #define FT_MEM_FREE( _pointer_ ) \ - FT_Free_Debug( memory, (void**)&(_pointer_), __FILE__, __LINE__ ) + FT_Free_Debug( memory, (void**)(void*)&(_pointer_), __FILE__, __LINE__ ) #else /* !FT_DEBUG_MEMORY */ #define FT_MEM_ALLOC( _pointer_, _size_ ) \ - FT_Alloc( memory, _size_, (void**)&(_pointer_) ) + FT_Alloc( memory, _size_, (void**)(void*)&(_pointer_) ) #define FT_MEM_FREE( _pointer_ ) \ - FT_Free( memory, (void**)&(_pointer_) ) + FT_Free( memory, (void**)(void*)&(_pointer_) ) #define FT_MEM_REALLOC( _pointer_, _current_, _size_ ) \ - FT_Realloc( memory, _current_, _size_, (void**)&(_pointer_) ) + FT_Realloc( memory, _current_, _size_, (void**)(void*)&(_pointer_) ) #define FT_MEM_QALLOC( _pointer_, _size_ ) \ - FT_QAlloc( memory, _size_, (void**)&(_pointer_) ) + FT_QAlloc( memory, _size_, (void**)(void*)&(_pointer_) ) #define FT_MEM_QREALLOC( _pointer_, _current_, _size_ ) \ - FT_QRealloc( memory, _current_, _size_, (void**)&(_pointer_) ) + FT_QRealloc( memory, _current_, _size_, (void**)(void*)&(_pointer_) ) #endif /* !FT_DEBUG_MEMORY */ Index: src/base/ftglyph.c =================================================================== RCS file: /cvsroot/freetype/freetype2/src/base/ftglyph.c,v retrieving revision 1.67 diff -u -p -r1.67 ftglyph.c --- src/base/ftglyph.c 20 May 2005 21:52:18 -0000 1.67 +++ src/base/ftglyph.c 23 May 2005 01:31:01 -0000 @@ -603,7 +603,7 @@ /* create result bitmap glyph */ error = ft_new_glyph( glyph->library, &ft_bitmap_glyph_class, - (FT_Glyph*)&bitmap ); + (FT_Glyph*)(void*)&bitmap ); if ( error ) goto Exit; Index: src/base/ftinit.c =================================================================== RCS file: /cvsroot/freetype/freetype2/src/base/ftinit.c,v retrieving revision 1.36 diff -u -p -r1.36 ftinit.c --- src/base/ftinit.c 16 Sep 2002 06:15:31 -0000 1.36 +++ src/base/ftinit.c 23 May 2005 01:31:01 -0000 @@ -55,9 +55,9 @@ #undef FT_USE_MODULE #ifdef __cplusplus -#define FT_USE_MODULE( x ) extern "C" const FT_Module_Class* x; +#define FT_USE_MODULE( x ) extern "C" const FT_Module_Class x; #else -#define FT_USE_MODULE( x ) extern const FT_Module_Class* x; +#define FT_USE_MODULE( x ) extern const FT_Module_Class x; #endif @@ -65,7 +65,7 @@ #undef FT_USE_MODULE -#define FT_USE_MODULE( x ) (const FT_Module_Class*)&x, +#define FT_USE_MODULE( x ) (const FT_Module_Class*)&(x), static const FT_Module_Class* const ft_default_modules[] =