Update bundled freetype to 2.6.1

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

 /***************************************************************************/
 /*                                                                         */
 /*  ftrfork.h                                                              */
 /*                                                                         */
 /*    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,       */
 /*  modified, and distributed under the terms of the FreeType project      */
 /*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
 /*  this file you indicate that you have read the license and              */
 /*  understand and accept it fully.                                        */
 /*                                                                         */
 /***************************************************************************/
 
@@ skipping 19 matching lines @@
 #define FT_RACCESS_N_RULES  9
 
 
   /* A structure to describe a reference in a resource by its resource ID */
   /* and internal offset.  The `POST' resource expects to be concatenated */
   /* by the order of resource IDs instead of its appearance in the file.  */
 
   typedef struct  FT_RFork_Ref_
   {
     FT_UShort  res_id;
-    FT_ULong   offset;
+    FT_Long    offset;
 
   } FT_RFork_Ref;
 
 #ifdef FT_CONFIG_OPTION_GUESSING_EMBEDDED_RFORK
   typedef FT_Error
   (*ft_raccess_guess_func)( FT_Library  library,
                             FT_Stream   stream,
                             char       *base_file_name,
                             char      **result_file_name,
                             FT_Long    *result_offset );
@@ skipping 18 matching lines @@
    */
   typedef struct ft_raccess_guess_rec_ {
     ft_raccess_guess_func  func;
     FT_RFork_Rule          type;
   } ft_raccess_guess_rec;
 
 #ifndef FT_CONFIG_OPTION_PIC
 
   /* 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 },
 #define CONST_FT_RFORK_RULE_ARRAY_END  };
 
 #else /* FT_CONFIG_OPTION_PIC */
 
   /* this array is a function in PIC mode, so no ; is needed in END */
 #define CONST_FT_RFORK_RULE_ARRAY_BEGIN( name, type )  \
           void                                         \
@@ skipping 160 matching lines @@
                               FT_Long   **offsets,
                               FT_Long    *count );
 
 
 FT_END_HEADER
 
 #endif /* __FTRFORK_H__ */
 
 
 /* END */