Merge to XFA: Update bundled freetype to 2.6.1

third_party/freetype/include/freetype/internal/ftrfork.h

Index: third_party/freetype/include/freetype/internal/ftrfork.h
diff --git a/third_party/freetype/include/internal/ftrfork.h b/third_party/freetype/include/freetype/internal/ftrfork.h
similarity index 99%
rename from third_party/freetype/include/internal/ftrfork.h
rename to third_party/freetype/include/freetype/internal/ftrfork.h
index d750cbefd8331a5558493fbc378f2f4f9eb10070..da61ca75b53339d849accd97bcc35d6196026c1c 100644
--- a/third_party/freetype/include/internal/ftrfork.h
+++ b/third_party/freetype/include/freetype/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 },