diff options
| author | marha <marha@users.sourceforge.net> | 2011-11-10 16:12:27 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-11-10 16:12:27 +0100 |
| commit | 82e62cfbf79bc8c19946d034a0d5e14ce4fabb44 (patch) | |
| tree | 16003af05805301a8a23d3ba0048e29eaf0fca73 /freetype/include | |
| parent | 7381bc7b9f63b2a6bf9ea9cbe04614adfc4b2369 (diff) | |
| parent | d783adea42f29bd7917929597ca1031b70587e1d (diff) | |
| download | vcxsrv-82e62cfbf79bc8c19946d034a0d5e14ce4fabb44.tar.gz vcxsrv-82e62cfbf79bc8c19946d034a0d5e14ce4fabb44.tar.bz2 vcxsrv-82e62cfbf79bc8c19946d034a0d5e14ce4fabb44.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'freetype/include')
| -rw-r--r-- | freetype/include/freetype/config/ftconfig.h | 4 | ||||
| -rw-r--r-- | freetype/include/freetype/config/ftstdlib.h | 13 | ||||
| -rw-r--r-- | freetype/include/freetype/freetype.h | 2 |
3 files changed, 8 insertions, 11 deletions
diff --git a/freetype/include/freetype/config/ftconfig.h b/freetype/include/freetype/config/ftconfig.h index b30489676..a9e767cdb 100644 --- a/freetype/include/freetype/config/ftconfig.h +++ b/freetype/include/freetype/config/ftconfig.h @@ -95,10 +95,6 @@ FT_BEGIN_HEADER #endif - /* Preferred alignment of data */ -#define FT_ALIGNMENT 8 - - /* FT_UNUSED is a macro used to indicate that a given parameter is not */ /* used -- this is only used to get rid of unpleasant compiler warnings */ #ifndef FT_UNUSED diff --git a/freetype/include/freetype/config/ftstdlib.h b/freetype/include/freetype/config/ftstdlib.h index 30ec14e74..11d5d0e65 100644 --- a/freetype/include/freetype/config/ftstdlib.h +++ b/freetype/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 /**********************************************************************/ diff --git a/freetype/include/freetype/freetype.h b/freetype/include/freetype/freetype.h index 660b3032d..08b77e16c 100644 --- a/freetype/include/freetype/freetype.h +++ b/freetype/include/freetype/freetype.h @@ -3810,7 +3810,7 @@ FT_BEGIN_HEADER */ #define FREETYPE_MAJOR 2 #define FREETYPE_MINOR 4 -#define FREETYPE_PATCH 6 +#define FREETYPE_PATCH 7 /*************************************************************************/ |