diff options
| author | marha <marha@users.sourceforge.net> | 2012-03-12 10:48:52 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-03-12 10:48:52 +0100 |
| commit | 485b633824020c557eb60258e1d36975c8c44770 (patch) | |
| tree | f48baf73d5a7ae814aae825e7b1405189eab9f0a /freetype/src/bzip2 | |
| parent | c84235ee0d9940e6a779ec306e615603b58a79f2 (diff) | |
| parent | 41bd254198b8b879a562a85f7dc868c3c0f7fbc1 (diff) | |
| download | vcxsrv-485b633824020c557eb60258e1d36975c8c44770.tar.gz vcxsrv-485b633824020c557eb60258e1d36975c8c44770.tar.bz2 vcxsrv-485b633824020c557eb60258e1d36975c8c44770.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
freetype/src/base/ftrfork.c
freetype/src/cff/cffpic.c
freetype/src/pfr/pfrobjs.c
freetype/src/winfonts/winfnt.c
Diffstat (limited to 'freetype/src/bzip2')
| -rw-r--r-- | freetype/src/bzip2/ftbzip2.c | 3 |
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 |