From 41371e1e39c8528eb0c4bc40683c736e6683e60c Mon Sep 17 00:00:00 2001 From: Eric Vannier Date: Thu, 22 Mar 2012 16:08:33 -0700 Subject: Update to freetype 2.4.9 This was done by applying the entire 2.4.9 except for the following exceptions: - files that were new, or were not present originally in the version of freetype we were using (meaning that they are present in 2.4.8, and in 2.4.9, but were never integrated into the Android tree because they are not used in the Android tree). - ftmodule.h: given that we support fewer modules than in upstream 2.4.9 (same as Android), the file was left unchanged (and there were no changes from the official 2.4.8 to 2.4.9 - ftoption.h: same reasons as ftmodule.h Change-Id: Id251f2cc5ca1c864f9a4cc0c67b94025ee3ccc4a --- src/sfnt/sferrors.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/sfnt/sferrors.h') diff --git a/src/sfnt/sferrors.h b/src/sfnt/sferrors.h index 27f90de..564a3fe 100644 --- a/src/sfnt/sferrors.h +++ b/src/sfnt/sferrors.h @@ -4,7 +4,7 @@ /* */ /* SFNT error codes (specification only). */ /* */ -/* Copyright 2001, 2004 by */ +/* Copyright 2001, 2004, 2012 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -29,6 +29,7 @@ #undef __FTERRORS_H__ +#undef FT_ERR_PREFIX #define FT_ERR_PREFIX SFNT_Err_ #define FT_ERR_BASE FT_Mod_Err_SFNT -- cgit v1.2.3