aboutsummaryrefslogtreecommitdiff
path: root/freetype/src/cache/ftccache.h
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-06-21 10:45:51 +0200
committermarha <marha@users.sourceforge.net>2013-06-21 10:48:19 +0200
commitfa791414601df61d20d860299dba80fdb62565df (patch)
treeeecc4c74bb78dece330009c571ed57d7f1aaede2 /freetype/src/cache/ftccache.h
parent7f9fb534564d0eb8a62cf444e569a07166e5ee03 (diff)
downloadvcxsrv-fa791414601df61d20d860299dba80fdb62565df.tar.gz
vcxsrv-fa791414601df61d20d860299dba80fdb62565df.tar.bz2
vcxsrv-fa791414601df61d20d860299dba80fdb62565df.zip
Upgraded freetype to 2.5.0.1
Diffstat (limited to 'freetype/src/cache/ftccache.h')
-rw-r--r--freetype/src/cache/ftccache.h13
1 files changed, 3 insertions, 10 deletions
diff --git a/freetype/src/cache/ftccache.h b/freetype/src/cache/ftccache.h
index d60984f77..4155f320e 100644
--- a/freetype/src/cache/ftccache.h
+++ b/freetype/src/cache/ftccache.h
@@ -4,8 +4,7 @@
/* */
/* FreeType internal cache interface (specification). */
/* */
-/* Copyright 2000-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010, */
-/* 2011 by */
+/* Copyright 2000-2007, 2009-2011, 2013 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -87,12 +86,6 @@ FT_BEGIN_HEADER
ftc_get_top_node_for_hash( ( cache ), ( hash ) )
#endif
-#ifdef FT_CONFIG_OPTION_OLD_INTERNALS
- FT_BASE( void )
- ftc_node_destroy( FTC_Node node,
- FTC_Manager manager );
-#endif
-
/*************************************************************************/
/*************************************************************************/
@@ -223,7 +216,7 @@ FT_BEGIN_HEADER
FT_Bool _list_changed = FALSE; \
\
\
- error = FTC_Err_Ok; \
+ error = FT_Err_Ok; \
node = NULL; \
\
/* Go to the `top' node of the list sharing same masked hash */ \
@@ -328,7 +321,7 @@ FT_BEGIN_HEADER
#define FTC_CACHE_TRYLOOP_END( list_changed ) \
- if ( !error || error != FTC_Err_Out_Of_Memory ) \
+ if ( !error || FT_ERR_NEQ( error, Out_Of_Memory ) ) \
break; \
\
_try_done = FTC_Manager_FlushN( _try_manager, _try_count ); \