diff options
| author | Chris Liddell <chris.liddell@artifex.com> | 2022-05-04 10:45:16 +0100 |
|---|---|---|
| committer | Chris Liddell <chris.liddell@artifex.com> | 2022-05-05 16:06:03 +0100 |
| commit | db9a7ae594cce27232b27b802e97cfb6273fd2f0 (patch) | |
| tree | b629ce759821c7aa9fa84f9e0634448aa29aeb8b /freetype/include/freetype/internal/compiler-macros.h | |
| parent | daff44df763441a772719054746c685c70aa9c1a (diff) | |
| download | ghostpdl-db9a7ae594cce27232b27b802e97cfb6273fd2f0.tar.gz | |
Update freetype to 2.12.1
Diffstat (limited to 'freetype/include/freetype/internal/compiler-macros.h')
| -rw-r--r-- | freetype/include/freetype/internal/compiler-macros.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/freetype/include/freetype/internal/compiler-macros.h b/freetype/include/freetype/internal/compiler-macros.h index d8b61b3dc..66fa13c3c 100644 --- a/freetype/include/freetype/internal/compiler-macros.h +++ b/freetype/include/freetype/internal/compiler-macros.h @@ -4,7 +4,7 @@ * * Compiler-specific macro definitions used internally by FreeType. * - * Copyright (C) 2020-2021 by + * Copyright (C) 2020-2022 by * David Turner, Robert Wilhelm, and Werner Lemberg. * * This file is part of the FreeType project, and may only be used, @@ -299,10 +299,12 @@ FT_BEGIN_HEADER #define FT_CALLBACK_DEF( x ) static x #endif -#if defined( __i386__ ) +#if defined( __GNUC__ ) && defined( __i386__ ) #define FT_COMPARE_DEF( x ) FT_CALLBACK_DEF( x ) __attribute__(( cdecl )) -#elif defined( _M_IX86 ) +#elif defined( _MSC_VER ) && defined( _M_IX86 ) #define FT_COMPARE_DEF( x ) FT_CALLBACK_DEF( x ) __cdecl +#elif defined( __WATCOMC__ ) && __WATCOMC__ >= 1240 +#define FT_COMPARE_DEF( x ) FT_CALLBACK_DEF( x ) __watcall #else #define FT_COMPARE_DEF( x ) FT_CALLBACK_DEF( x ) #endif |