walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Havoc Pennington 2001-09-19 21:20:36 +00:00 committed by Havoc Pennington
parent 9c37226efe
commit 87a475c09f
7 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Makefile.am
View File

@ -18,6 +18,7 @@ LDADDS = @STRIP_BEGIN@ \
noinst_LTLIBRARIES = libpango-ot.la noinst_LTLIBRARIES = libpango-ot.la
libpango_ot_la_SOURCES = \ libpango_ot_la_SOURCES = \
fterrcompat.h \
ftxopen.c \ ftxopen.c \
ftxopen.h \ ftxopen.h \
ftxopenf.h \ ftxopenf.h \

16
src/fterrcompat.h Normal file
View File

@ -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

3
src/ftxgdef.c
View File

@ -19,9 +19,10 @@
#include <freetype/internal/ftstream.h> #include <freetype/internal/ftstream.h>
#include <freetype/internal/ftmemory.h> #include <freetype/internal/ftmemory.h>
#include <freetype/internal/tterrors.h>
#include <freetype/internal/tttypes.h> #include <freetype/internal/tttypes.h>
#include "fterrcompat.h"
#include "ftxopen.h" #include "ftxopen.h"
#include "ftxopenf.h" #include "ftxopenf.h"

3
src/ftxgpos.c
View File

@ -27,9 +27,10 @@
#include <freetype/internal/ftstream.h> #include <freetype/internal/ftstream.h>
#include <freetype/internal/ftmemory.h> #include <freetype/internal/ftmemory.h>
#include <freetype/internal/tterrors.h>
#include <freetype/internal/tttypes.h> #include <freetype/internal/tttypes.h>
#include "fterrcompat.h"
#include "ftxopen.h" #include "ftxopen.h"
#include "ftxopenf.h" #include "ftxopenf.h"

3
src/ftxgsub.c
View File

@ -27,9 +27,10 @@
#include <freetype/internal/ftstream.h> #include <freetype/internal/ftstream.h>
#include <freetype/internal/ftmemory.h> #include <freetype/internal/ftmemory.h>
#include <freetype/internal/tterrors.h>
#include <freetype/internal/tttypes.h> #include <freetype/internal/tttypes.h>
#include "fterrcompat.h"
#include "ftxopen.h" #include "ftxopen.h"
#include "ftxopenf.h" #include "ftxopenf.h"

3
src/ftxopen.c
View File

@ -17,9 +17,10 @@
#include <freetype/internal/ftstream.h> #include <freetype/internal/ftstream.h>
#include <freetype/internal/ftmemory.h> #include <freetype/internal/ftmemory.h>
#include <freetype/internal/tterrors.h>
#include <freetype/internal/tttypes.h> #include <freetype/internal/tttypes.h>
#include "fterrcompat.h"
#include "ftxopen.h" #include "ftxopen.h"
#include "ftxopenf.h" #include "ftxopenf.h"

2
src/pango-ot-info.c
View File

@ -20,7 +20,7 @@
*/ */
#include "pango-ot-private.h" #include "pango-ot-private.h"
#include <freetype/internal/tterrors.h> #include "fterrcompat.h"
#include <freetype/internal/ftobjs.h> #include <freetype/internal/ftobjs.h>
#include <freetype/ftmodule.h> #include <freetype/ftmodule.h>