Merge to XFA: Update bundled freetype to 2.6.1

third_party/freetype/include/freetype/ftadvanc.h

Index: third_party/freetype/include/freetype/ftadvanc.h
diff --git a/third_party/freetype/include/ftadvanc.h b/third_party/freetype/include/freetype/ftadvanc.h
similarity index 98%
rename from third_party/freetype/include/ftadvanc.h
rename to third_party/freetype/include/freetype/ftadvanc.h
index 955f93fa16cbeeca8cfd1d12ba456085e7b058a8..b4d2aed567730a8b103ca7ad593bedc5b26bc5a3 100644
--- a/third_party/freetype/include/ftadvanc.h
+++ b/third_party/freetype/include/freetype/ftadvanc.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Quick computation of advance widths (specification only).            */
 /*                                                                         */
-/*  Copyright 2008, 2013, 2014 by                                          */
+/*  Copyright 2008-2015 by                                                 */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -77,7 +77,7 @@ FT_BEGIN_HEADER
   /*    and hinting of the glyph outline, are extremely slow by            */
   /*    comparison.                                                        */
   /*                                                                       */
-#define FT_ADVANCE_FLAG_FAST_ONLY  0x20000000UL
+#define FT_ADVANCE_FLAG_FAST_ONLY  0x20000000L
 
 
   /*************************************************************************/