Make ftraster.c compile in stand-alone mode with MSVC compiler.
* src/raster/ftmisc.h (FT_Int64) [_WIN32, _WIN64]: Fix typedef since there is no `inttypes.h' for MSVC.
This commit is contained in:
parent
888cd1843e
commit
603d121872
|
@ -1,3 +1,10 @@
|
|||
2010-07-09 Ken Sharp <ken.sharp@artifex.com>
|
||||
|
||||
Make ftraster.c compile in stand-alone mode with MSVC compiler.
|
||||
|
||||
* src/raster/ftmisc.h (FT_Int64) [_WIN32, _WIN64]: Fix typedef
|
||||
since there is no `inttypes.h' for MSVC.
|
||||
|
||||
2010-07-08 Werner Lemberg <wl@gnu.org>
|
||||
|
||||
Fix Savannah bug #30361.
|
||||
|
|
|
@ -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,
|
||||
|
|
Loading…
Reference in New Issue