diff options
| author | Havoc Pennington <hp@redhat.com> | 2001-09-19 21:20:36 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@src.gnome.org> | 2001-09-19 21:20:36 +0000 |
| commit | c8c873fb519799f61034d61f23f6e2ec1decb569 (patch) | |
| tree | 8dea4cc686de762827186c88a82dc23537c94a31 /pango | |
| parent | cbfc2bbc09c9a666eedba8b965037f3c10be04c2 (diff) | |
| download | pango-c8c873fb519799f61034d61f23f6e2ec1decb569.tar.gz | |
header to abstract the difference between FreeType 2.0.3 and 2.0.4 error
2001-09-19 Havoc Pennington <hp@redhat.com>
* pango/opentype/fterrcompat.h: header to abstract the difference
between FreeType 2.0.3 and 2.0.4 error codes, based on the
configure check.
* configure.in: check for the tterrors.h header in FreeType 2.0.3,
and define HAVE_FREETYPE_2_0_3 if we have it
Diffstat (limited to 'pango')
| -rw-r--r-- | pango/opentype/Makefile.am | 1 | ||||
| -rw-r--r-- | pango/opentype/fterrcompat.h | 16 | ||||
| -rw-r--r-- | pango/opentype/ftxgdef.c | 3 | ||||
| -rw-r--r-- | pango/opentype/ftxgpos.c | 3 | ||||
| -rw-r--r-- | pango/opentype/ftxgsub.c | 3 | ||||
| -rw-r--r-- | pango/opentype/ftxopen.c | 3 | ||||
| -rw-r--r-- | pango/opentype/pango-ot-info.c | 2 |
7 files changed, 26 insertions, 5 deletions
diff --git a/pango/opentype/Makefile.am b/pango/opentype/Makefile.am index 9f9c9dd5..2081396a 100644 --- a/pango/opentype/Makefile.am +++ b/pango/opentype/Makefile.am @@ -18,6 +18,7 @@ LDADDS = @STRIP_BEGIN@ \ noinst_LTLIBRARIES = libpango-ot.la libpango_ot_la_SOURCES = \ + fterrcompat.h \ ftxopen.c \ ftxopen.h \ ftxopenf.h \ diff --git a/pango/opentype/fterrcompat.h b/pango/opentype/fterrcompat.h new file mode 100644 index 00000000..70b45e22 --- /dev/null +++ b/pango/opentype/fterrcompat.h @@ -0,0 +1,16 @@ + +#ifndef FTERRCOMPAT_H +#define FTERRCOMPAT_H + +#include <config.h> + +#ifdef HAVE_FREETYPE_2_0_3 +#include <freetype/internal/tterrors.h> +#else +#define TT_Err_Ok FT_Err_Ok +#define TT_Err_Invalid_Argument FT_Err_Invalid_Argument +#define TT_Err_Invalid_Face_Handle FT_Err_Invalid_Face_Handle +#define TT_Err_Table_Missing FT_Err_Table_Missing +#endif + +#endif diff --git a/pango/opentype/ftxgdef.c b/pango/opentype/ftxgdef.c index ee177e85..54b1dd01 100644 --- a/pango/opentype/ftxgdef.c +++ b/pango/opentype/ftxgdef.c @@ -19,9 +19,10 @@ #include <freetype/internal/ftstream.h> #include <freetype/internal/ftmemory.h> -#include <freetype/internal/tterrors.h> #include <freetype/internal/tttypes.h> +#include "fterrcompat.h" + #include "ftxopen.h" #include "ftxopenf.h" diff --git a/pango/opentype/ftxgpos.c b/pango/opentype/ftxgpos.c index 07d73d9f..7515b53b 100644 --- a/pango/opentype/ftxgpos.c +++ b/pango/opentype/ftxgpos.c @@ -27,9 +27,10 @@ #include <freetype/internal/ftstream.h> #include <freetype/internal/ftmemory.h> -#include <freetype/internal/tterrors.h> #include <freetype/internal/tttypes.h> +#include "fterrcompat.h" + #include "ftxopen.h" #include "ftxopenf.h" diff --git a/pango/opentype/ftxgsub.c b/pango/opentype/ftxgsub.c index 43adb2ce..b1f516cd 100644 --- a/pango/opentype/ftxgsub.c +++ b/pango/opentype/ftxgsub.c @@ -27,9 +27,10 @@ #include <freetype/internal/ftstream.h> #include <freetype/internal/ftmemory.h> -#include <freetype/internal/tterrors.h> #include <freetype/internal/tttypes.h> +#include "fterrcompat.h" + #include "ftxopen.h" #include "ftxopenf.h" diff --git a/pango/opentype/ftxopen.c b/pango/opentype/ftxopen.c index 07a50290..7815aba8 100644 --- a/pango/opentype/ftxopen.c +++ b/pango/opentype/ftxopen.c @@ -17,9 +17,10 @@ #include <freetype/internal/ftstream.h> #include <freetype/internal/ftmemory.h> -#include <freetype/internal/tterrors.h> #include <freetype/internal/tttypes.h> +#include "fterrcompat.h" + #include "ftxopen.h" #include "ftxopenf.h" diff --git a/pango/opentype/pango-ot-info.c b/pango/opentype/pango-ot-info.c index b426e32e..5a657c45 100644 --- a/pango/opentype/pango-ot-info.c +++ b/pango/opentype/pango-ot-info.c @@ -20,7 +20,7 @@ */ #include "pango-ot-private.h" -#include <freetype/internal/tterrors.h> +#include "fterrcompat.h" #include <freetype/internal/ftobjs.h> #include <freetype/ftmodule.h> |