diff options
| author | Makoto Onuki <omakoto@google.com> | 2015-06-09 16:35:08 -0700 |
|---|---|---|
| committer | Abhisek Devkota <ciwrl@cyanogenmod.com> | 2015-08-19 11:42:11 -0700 |
| commit | a3a6685e80688af254c5c23a62a2f3b0bcef5e5f (patch) | |
| tree | 7e67208cafc4572557e8d10469fb5dc173ca2edf /include/internal/ftrfork.h | |
| parent | 6bb07037be23a1523b3af5b1be5432bd4ccf22b7 (diff) | |
| download | android_external_freetype-a3a6685e80688af254c5c23a62a2f3b0bcef5e5f.tar.gz android_external_freetype-a3a6685e80688af254c5c23a62a2f3b0bcef5e5f.tar.bz2 android_external_freetype-a3a6685e80688af254c5c23a62a2f3b0bcef5e5f.zip | |
Update to freetype 2.6.0stable/cm-11.0-XNG3C
Bug 18751561
RM-154
Change-Id: Ia8c081f8fd38a1f78c72d30234c5ace8cfffe6a9
(cherry picked from commit c341565733345bef8ebe68db3c175301afe4ec97)
Diffstat (limited to 'include/internal/ftrfork.h')
| -rw-r--r-- | include/internal/ftrfork.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/internal/ftrfork.h b/include/internal/ftrfork.h index d750cbe..da61ca7 100644 --- a/include/internal/ftrfork.h +++ b/include/internal/ftrfork.h @@ -4,7 +4,7 @@ /* */ /* Embedded resource forks accessor (specification). */ /* */ -/* Copyright 2004, 2006, 2007, 2012, 2013 by */ +/* Copyright 2004-2015 by */ /* Masatake YAMATO and Redhat K.K. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -44,7 +44,7 @@ FT_BEGIN_HEADER typedef struct FT_RFork_Ref_ { FT_UShort res_id; - FT_ULong offset; + FT_Long offset; } FT_RFork_Ref; @@ -83,7 +83,7 @@ FT_BEGIN_HEADER /* this array is a storage in non-PIC mode, so ; is needed in END */ #define CONST_FT_RFORK_RULE_ARRAY_BEGIN( name, type ) \ - const type name[] = { + static const type name[] = { #define CONST_FT_RFORK_RULE_ARRAY_ENTRY( func_suffix, type_suffix ) \ { raccess_guess_ ## func_suffix, \ FT_RFork_Rule_ ## type_suffix }, |