diff options
| author | Geremy Condra <gcondra@google.com> | 2011-11-17 14:08:04 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-17 14:08:04 -0800 |
| commit | a56904260208e9306d661349cc2bddfad8f29019 (patch) | |
| tree | 720489aa1d9176e568acf0f8cb441a3f8cb0663f /include/freetype/config/ftstdlib.h | |
| parent | ec53de77a7ec24f862372a39333f8e91708a806d (diff) | |
| parent | bff90fb5ec88ad7fdfb6d1d2f5a5719c20a2c5dc (diff) | |
| download | android_external_freetype-a56904260208e9306d661349cc2bddfad8f29019.tar.gz android_external_freetype-a56904260208e9306d661349cc2bddfad8f29019.tar.bz2 android_external_freetype-a56904260208e9306d661349cc2bddfad8f29019.zip | |
Merge "DO NOT MERGE Update FreeType library to 2.4.7"
Diffstat (limited to 'include/freetype/config/ftstdlib.h')
| -rw-r--r-- | include/freetype/config/ftstdlib.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/include/freetype/config/ftstdlib.h b/include/freetype/config/ftstdlib.h index 30ec14e..11d5d0e 100644 --- a/include/freetype/config/ftstdlib.h +++ b/include/freetype/config/ftstdlib.h @@ -5,7 +5,7 @@ /* ANSI-specific library and header configuration file (specification */ /* only). */ /* */ -/* Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2009 by */ +/* Copyright 2002-2007, 2009, 2011 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -59,11 +59,12 @@ #include <limits.h> -#define FT_CHAR_BIT CHAR_BIT -#define FT_INT_MAX INT_MAX -#define FT_INT_MIN INT_MIN -#define FT_UINT_MAX UINT_MAX -#define FT_ULONG_MAX ULONG_MAX +#define FT_CHAR_BIT CHAR_BIT +#define FT_USHORT_MAX USHRT_MAX +#define FT_INT_MAX INT_MAX +#define FT_INT_MIN INT_MIN +#define FT_UINT_MAX UINT_MAX +#define FT_ULONG_MAX ULONG_MAX /**********************************************************************/ |