Merge to XFA: Update bundled freetype to 2.6.1

third_party/freetype/src/cid/cidload.h

Index: third_party/freetype/src/cid/cidload.h
diff --git a/third_party/freetype/src/cid/cidload.h b/third_party/freetype/src/cid/cidload.h
index 8c172ffee2d235aaa8af47860f825cbcca441a71..d7776d2f88af0294a90bb3be81e40a020c44aef0 100644
--- a/third_party/freetype/src/cid/cidload.h
+++ b/third_party/freetype/src/cid/cidload.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    CID-keyed Type1 font loader (specification).                         */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002, 2003, 2004 by                               */
+/*  Copyright 1996-2015 by                                                 */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -36,7 +36,7 @@ FT_BEGIN_HEADER
   } CID_Loader;
 
 
-  FT_LOCAL( FT_Long )
+  FT_LOCAL( FT_ULong )
   cid_get_offset( FT_Byte**  start,
                   FT_Byte    offsize );