Module Name: xsrc
Committed By: snj
Date: Mon Apr 13 18:55:08 UTC 2009
Modified Files:
xsrc/external/mit/freetype/dist/src/gzip: ftgzip.c
Removed Files:
xsrc/external/mit/freetype/dist/builds/win32/visualc: freetype.sln
freetype.vcproj
xsrc/external/mit/freetype/dist/builds/win32/visualce: freetype.dsp
freetype.dsw freetype.vcproj index.html
Log Message:
Merge freetype-2.3.9.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/freetype/dist/builds/win32/visualc/freetype.sln \
xsrc/external/mit/freetype/dist/builds/win32/visualc/freetype.vcproj
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/freetype/dist/builds/win32/visualce/freetype.dsp \
xsrc/external/mit/freetype/dist/builds/win32/visualce/freetype.dsw \
xsrc/external/mit/freetype/dist/builds/win32/visualce/freetype.vcproj \
xsrc/external/mit/freetype/dist/builds/win32/visualce/index.html
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/freetype/dist/src/gzip/ftgzip.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/freetype/dist/src/gzip/ftgzip.c
diff -u xsrc/external/mit/freetype/dist/src/gzip/ftgzip.c:1.2 xsrc/external/mit/freetype/dist/src/gzip/ftgzip.c:1.3
--- xsrc/external/mit/freetype/dist/src/gzip/ftgzip.c:1.2 Sat Apr 4 15:25:19 2009
+++ xsrc/external/mit/freetype/dist/src/gzip/ftgzip.c Mon Apr 13 18:55:07 2009
@@ -8,7 +8,7 @@
/* parse compressed PCF fonts, as found with many X11 server */
/* distributions. */
/* */
-/* Copyright 2002, 2003, 2004, 2005, 2006 by */
+/* Copyright 2002, 2003, 2004, 2005, 2006, 2009 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -25,7 +25,7 @@
#include FT_INTERNAL_STREAM_H
#include FT_INTERNAL_DEBUG_H
#include FT_GZIP_H
-#include <string.h>
+#include FT_CONFIG_STANDARD_LIBRARY_H
#include FT_MODULE_ERRORS_H
@@ -569,7 +569,7 @@
if ( error )
result = 0;
- FT_Stream_Seek( stream, old_pos );
+ (void)FT_Stream_Seek( stream, old_pos );
}
return result;
