diff options
| author | Alexei Podtelezhnikov <apodtele@gmail.com> | 2018-09-27 21:17:36 -0400 |
|---|---|---|
| committer | Alexei Podtelezhnikov <apodtele@gmail.com> | 2018-09-27 21:17:36 -0400 |
| commit | 877aa1b2cc662978aae61ed4d5c6ea8ba56b2fe7 (patch) | |
| tree | 3d1bf0eb5e56b6d205134ed5fc9717a3a0ab12ee /builds | |
| parent | 4500c701c29f154eb0acd44552590d0dc315ac5f (diff) | |
| download | freetype2-877aa1b2cc662978aae61ed4d5c6ea8ba56b2fe7.tar.gz | |
Align FreeType with standard C memory management.
* include/freetype/ftsystem.h: Include FT_TYPES_H.
(*FT_Alloc_Func, *FT_Realloc_Func): Use size_t for the size arguments.
* src/raster/ftmisc.h: Ditto.
* builds/amiga/src/base/ftsystem.c, builds/unix/ftsystem.c,
* builds/vms/ftsystem.c, src/base/ftsystem.c (ft_alloc, ft_realloc):
Use size_t for the size arguments.
* src/base/ftdbgmem.c (ft_mem_debug_alloc, ft_mem_debug_realloc): Use
FT_Offset, aka size_t, for the size arguments.
Diffstat (limited to 'builds')
| -rw-r--r-- | builds/amiga/src/base/ftsystem.c | 6 | ||||
| -rw-r--r-- | builds/unix/ftsystem.c | 6 | ||||
| -rw-r--r-- | builds/vms/ftsystem.c | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/builds/amiga/src/base/ftsystem.c b/builds/amiga/src/base/ftsystem.c index 53abdb01b..031bd29b8 100644 --- a/builds/amiga/src/base/ftsystem.c +++ b/builds/amiga/src/base/ftsystem.c @@ -139,7 +139,7 @@ Free_VecPooled( APTR poolHeader, /* */ FT_CALLBACK_DEF( void* ) ft_alloc( FT_Memory memory, - long size ) + size_t size ) { #ifdef __amigaos4__ return AllocVecPooled( memory->user, size ); @@ -171,8 +171,8 @@ Free_VecPooled( APTR poolHeader, /* */ FT_CALLBACK_DEF( void* ) ft_realloc( FT_Memory memory, - long cur_size, - long new_size, + size_t cur_size, + size_t new_size, void* block ) { void* new_block; diff --git a/builds/unix/ftsystem.c b/builds/unix/ftsystem.c index 449c0ed01..8e709883e 100644 --- a/builds/unix/ftsystem.c +++ b/builds/unix/ftsystem.c @@ -95,7 +95,7 @@ /* */ FT_CALLBACK_DEF( void* ) ft_alloc( FT_Memory memory, - long size ) + size_t size ) { FT_UNUSED( memory ); @@ -125,8 +125,8 @@ /* */ FT_CALLBACK_DEF( void* ) ft_realloc( FT_Memory memory, - long cur_size, - long new_size, + size_t cur_size, + size_t new_size, void* block ) { FT_UNUSED( memory ); diff --git a/builds/vms/ftsystem.c b/builds/vms/ftsystem.c index 71aab3563..51a7a3fd9 100644 --- a/builds/vms/ftsystem.c +++ b/builds/vms/ftsystem.c @@ -94,7 +94,7 @@ /* */ FT_CALLBACK_DEF( void* ) ft_alloc( FT_Memory memory, - long size ) + size_t size ) { FT_UNUSED( memory ); @@ -124,8 +124,8 @@ /* */ FT_CALLBACK_DEF( void* ) ft_realloc( FT_Memory memory, - long cur_size, - long new_size, + size_t cur_size, + size_t new_size, void* block ) { FT_UNUSED( memory ); |