aboutsummaryrefslogtreecommitdiff
path: root/freetype/src/bzip2
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-03-12 10:33:22 +0100
committermarha <marha@users.sourceforge.net>2012-03-12 10:33:22 +0100
commit41bd254198b8b879a562a85f7dc868c3c0f7fbc1 (patch)
tree3db49b4d73b8c4c734c1382ab5469a4f9f8baf93 /freetype/src/bzip2
parentb91444584a64f4f7b3eaeee05ef36ac53691fb24 (diff)
downloadvcxsrv-41bd254198b8b879a562a85f7dc868c3c0f7fbc1.tar.gz
vcxsrv-41bd254198b8b879a562a85f7dc868c3c0f7fbc1.tar.bz2
vcxsrv-41bd254198b8b879a562a85f7dc868c3c0f7fbc1.zip
Updated to freetype-2.4.9
Diffstat (limited to 'freetype/src/bzip2')
-rw-r--r--freetype/src/bzip2/ftbzip2.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/freetype/src/bzip2/ftbzip2.c b/freetype/src/bzip2/ftbzip2.c
index e443dc85e..d60ee3ea0 100644
--- a/freetype/src/bzip2/ftbzip2.c
+++ b/freetype/src/bzip2/ftbzip2.c
@@ -8,7 +8,7 @@
/* parse compressed PCF fonts, as found with many X11 server */
/* distributions. */
/* */
-/* Copyright 2010 by */
+/* Copyright 2010, 2012 by */
/* Joel Klinghed. */
/* */
/* Based on src/gzip/ftgzip.c, Copyright 2002 - 2010 by */
@@ -35,6 +35,7 @@
#undef __FTERRORS_H__
+#undef FT_ERR_PREFIX
#define FT_ERR_PREFIX Bzip2_Err_
#define FT_ERR_BASE FT_Mod_Err_Bzip2