Update freetype to 2.5.4.

third_party/freetype/include/ttnameid.h

 /***************************************************************************/
 /*                                                                         */
 /*  ttnameid.h                                                             */
 /*                                                                         */
 /*    TrueType name ID definitions (specification only).                   */
 /*                                                                         */
-/*  Copyright 1996-2004, 2006-2008, 2012 by                                */
+/*  Copyright 1996-2004, 2006-2008, 2012, 2013 by                          */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  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.                                        */
 /*                                                                         */
 /***************************************************************************/
 
 
 #ifndef __TTNAMEID_H__
 #define __TTNAMEID_H__
 
 
-#include "../ft2build.h"
+#include <ft2build.h>
 
 
 FT_BEGIN_HEADER
 
 
   /*************************************************************************/
   /*                                                                       */
   /* <Section>                                                             */
   /*    truetype_tables                                                    */
   /*                                                                       */
@@ skipping 1167 matching lines @@
 #endif
 
 
 #ifndef HAVE_LIMIT_ON_IDENTS
 
 
   /*************************************************************************/
   /*                                                                       */
   /* Here some alias #defines in order to be clearer.                      */
   /*                                                                       */
-  /* These are not always #defined to stay within the 31~character limit   */
+  /* These are not always #defined to stay within the 31~character limit,  */
   /* which some compilers have.                                            */
   /*                                                                       */
   /* Credits go to Dave Hoo <dhoo@flash.net> for pointing out that modern  */
   /* Borland compilers (read: from BC++ 3.1 on) can increase this limit.   */
   /* If you get a warning with such a compiler, use the -i40 switch.       */
   /*                                                                       */
 #define TT_UCR_ARABIC_PRESENTATION_FORMS_A      \
          TT_UCR_ARABIC_PRESENTATIONS_A
 #define TT_UCR_ARABIC_PRESENTATION_FORMS_B      \
          TT_UCR_ARABIC_PRESENTATIONS_B
 
 #define TT_UCR_COMBINING_DIACRITICAL_MARKS      \
          TT_UCR_COMBINING_DIACRITICS
 #define TT_UCR_COMBINING_DIACRITICAL_MARKS_SYMB \
          TT_UCR_COMBINING_DIACRITICS_SYMB
 
 
 #endif /* !HAVE_LIMIT_ON_IDENTS */
 
 
 FT_END_HEADER
 
 #endif /* __TTNAMEID_H__ */
 
 
 /* END */