Update freetype to 2.5.4.

third_party/freetype/include/ftsystem.h

 /***************************************************************************/
 /*                                                                         */
 /*  ftsystem.h                                                             */
 /*                                                                         */
 /*    FreeType low-level system interface definition (specification).      */
 /*                                                                         */
 /*  Copyright 1996-2001, 2002, 2005, 2010 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 __FTSYSTEM_H__
 #define __FTSYSTEM_H__
 
 
-#include "../ft2build.h"
+#include <ft2build.h>
 
 
 FT_BEGIN_HEADER
 
 
   /*************************************************************************/
   /*                                                                       */
   /* <Section>                                                             */
   /*   system_interface                                                    */
   /*                                                                       */
@@ skipping 48 matching lines @@
    *     The size in bytes to allocate.
    *
    * @return:
    *   Address of new memory block.  0~in case of failure.
    *
    */
   typedef void*
   (*FT_Alloc_Func)( FT_Memory  memory,
                     long       size );
 
-  /* Sunliang.Liu 20100915 sync 221's revison. */
-  typedef void*
-          (*FT_AllocDebug_Func)( FT_Memory  memory,
-          long       size, const char* filename,  int line);
-
-
 
   /*************************************************************************
    *
    * @functype:
    *   FT_Free_Func
    *
    * @description:
    *   A function used to release a given block of memory.
    *
    * @input:
@@ skipping 63 matching lines @@
    *     A pointer type to an memory freeing function.
    *
    *   realloc ::
    *     A pointer type to a reallocation function.
    *
    */
   struct  FT_MemoryRec_
   {
     void*            user;
     FT_Alloc_Func    alloc;
-        FT_AllocDebug_Func allocdebug;  /* Sunliang.Liu 20100915 sync 221's revison. */
     FT_Free_Func     free;
     FT_Realloc_Func  realloc;
   };
 
 
   /*************************************************************************/
   /*                                                                       */
   /*                       I / O   M A N A G E M E N T                     */
   /*                                                                       */
   /*************************************************************************/
@@ skipping 143 matching lines @@
     FT_StreamDesc        pathname;
     FT_Stream_IoFunc     read;
     FT_Stream_CloseFunc  close;
 
     FT_Memory            memory;
     unsigned char*       cursor;
     unsigned char*       limit;
 
   } FT_StreamRec;
 
-
   /* */
 
 
 FT_END_HEADER
 
 #endif /* __FTSYSTEM_H__ */
 
 
 /* END */