diff options
| author | Nick Kralevich <nnk@google.com> | 2010-09-16 11:32:17 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-16 11:32:17 -0700 |
| commit | cb487e4c5295d0d9bb96ddd3a27372ffad41ae5b (patch) | |
| tree | 2b4c5412391bf31f6a54b237ea83bfde05ec3802 /src/raster/ftmisc.h | |
| parent | f2873c598230898219f9481ffb43edc5e4d3f806 (diff) | |
| parent | aacb8e1368a883fcbc9fe64fd0e460cef9c9b20c (diff) | |
| download | android_external_freetype-cb487e4c5295d0d9bb96ddd3a27372ffad41ae5b.tar.gz android_external_freetype-cb487e4c5295d0d9bb96ddd3a27372ffad41ae5b.tar.bz2 android_external_freetype-cb487e4c5295d0d9bb96ddd3a27372ffad41ae5b.zip | |
am aacb8e13: upgrade freetype to 2.4.2.
Merge commit 'aacb8e1368a883fcbc9fe64fd0e460cef9c9b20c'
* commit 'aacb8e1368a883fcbc9fe64fd0e460cef9c9b20c':
upgrade freetype to 2.4.2.
Diffstat (limited to 'src/raster/ftmisc.h')
| -rw-r--r-- | src/raster/ftmisc.h | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/raster/ftmisc.h b/src/raster/ftmisc.h index f04b540..7773924 100644 --- a/src/raster/ftmisc.h +++ b/src/raster/ftmisc.h @@ -5,7 +5,7 @@ /* Miscellaneous macros for stand-alone rasterizer (specification */ /* only). */ /* */ -/* Copyright 2005, 2009 by */ +/* Copyright 2005, 2009, 2010 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used */ @@ -27,6 +27,7 @@ #ifndef __FTMISC_H__ #define __FTMISC_H__ + /* memset */ #include FT_CONFIG_STANDARD_LIBRARY_H @@ -35,6 +36,7 @@ #define FT_LOCAL_DEF( x ) static x + /* from include/freetype2/fttypes.h */ typedef unsigned char FT_Byte; @@ -77,12 +79,22 @@ } FT_MemoryRec; + /* from src/ftcalc.c */ -#include <inttypes.h> +#if ( defined _WIN32 || defined _WIN64 ) + + typedef __int64 FT_Int64; + +#else + +#include "inttypes.h" typedef int64_t FT_Int64; +#endif + + static FT_Long FT_MulDiv( FT_Long a, FT_Long b, |