diff options
author | Clyne Sullivan <tullivan99@gmail.com> | 2016-04-13 08:47:41 -0400 |
---|---|---|
committer | Clyne Sullivan <tullivan99@gmail.com> | 2016-04-13 08:47:41 -0400 |
commit | fa4b6e00fd204998f6011420bdad60477b7a2f12 (patch) | |
tree | 4fd37e92f375ddb49e156b07811b8a2fe1ad6c0d /include/freetype/config | |
parent | 03130c5bcec3c885a1be005c24e192dfb57f3fe5 (diff) |
parentheses
Diffstat (limited to 'include/freetype/config')
-rw-r--r-- | include/freetype/config/ftconfig.h | 116 | ||||
-rw-r--r-- | include/freetype/config/ftmodule.h | 40 | ||||
-rw-r--r-- | include/freetype/config/ftoption.h | 14 | ||||
-rw-r--r-- | include/freetype/config/ftstdlib.h | 2 |
4 files changed, 86 insertions, 86 deletions
diff --git a/include/freetype/config/ftconfig.h b/include/freetype/config/ftconfig.h index 11d5d95..c35053f 100644 --- a/include/freetype/config/ftconfig.h +++ b/include/freetype/config/ftconfig.h @@ -121,7 +121,7 @@ FT_BEGIN_HEADER /* 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 -#define FT_UNUSED( arg ) ( (arg) = (arg) ) +#define FT_UNUSED(arg) ((arg) = (arg)) #endif @@ -143,7 +143,7 @@ FT_BEGIN_HEADER /* This is the only necessary change, so it is defined here instead */ /* providing a new configuration file. */ /* */ -#if defined( __APPLE__ ) || ( defined( __MWERKS__ ) && defined( macintosh ) ) +#if defined(__APPLE__) || (defined(__MWERKS__) && defined(macintosh)) /* no Carbon frameworks for 64bit 10.4.x */ /* AvailabilityMacros.h is available since Mac OS X 10.2, */ /* so guess the system version by maximum errno before inclusion */ @@ -151,12 +151,12 @@ FT_BEGIN_HEADER #ifdef ECANCELED /* defined since 10.2 */ #include "AvailabilityMacros.h" #endif -#if defined( __LP64__ ) && \ - ( MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4 ) +#if defined(__LP64__) && \ + (MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4) #undef FT_MACINTOSH #endif -#elif defined( __SC__ ) || defined( __MRC__ ) +#elif defined(__SC__) || defined(__MRC__) /* Classic MacOS compilers */ #include "ConditionalMacros.h" #if TARGET_OS_MAC @@ -167,8 +167,8 @@ FT_BEGIN_HEADER /* Fix compiler warning with sgi compiler */ -#if defined( __sgi ) && !defined( __GNUC__ ) -#if defined( _COMPILER_VERSION ) && ( _COMPILER_VERSION >= 730 ) +#if defined(__sgi) && !defined(__GNUC__) +#if defined(_COMPILER_VERSION) && (_COMPILER_VERSION >= 730) #pragma set woff 3505 #endif #endif @@ -297,14 +297,14 @@ FT_BEGIN_HEADER #define FT_INT64 long #define FT_UINT64 unsigned long -#elif defined( _MSC_VER ) && _MSC_VER >= 900 /* Visual C++ (and Intel C++) */ +#elif defined(_MSC_VER) && _MSC_VER >= 900 /* Visual C++ (and Intel C++) */ /* this compiler provides the __int64 type */ #define FT_LONG64 #define FT_INT64 __int64 #define FT_UINT64 unsigned __int64 -#elif defined( __BORLANDC__ ) /* Borland C++ */ +#elif defined(__BORLANDC__) /* Borland C++ */ /* XXXX: We should probably check the value of __BORLANDC__ in order */ /* to test the compiler version. */ @@ -314,17 +314,17 @@ FT_BEGIN_HEADER #define FT_INT64 __int64 #define FT_UINT64 unsigned __int64 -#elif defined( __WATCOMC__ ) /* Watcom C++ */ +#elif defined(__WATCOMC__) /* Watcom C++ */ /* Watcom doesn't provide 64-bit data types */ -#elif defined( __MWERKS__ ) /* Metrowerks CodeWarrior */ +#elif defined(__MWERKS__) /* Metrowerks CodeWarrior */ #define FT_LONG64 #define FT_INT64 long long int #define FT_UINT64 unsigned long long int -#elif defined( __GNUC__ ) +#elif defined(__GNUC__) /* GCC provides the `long long' type */ #define FT_LONG64 @@ -341,7 +341,7 @@ FT_BEGIN_HEADER /* is defined. You can however ignore this rule by defining the */ /* FT_CONFIG_OPTION_FORCE_INT64 configuration macro. */ /* */ -#if defined( FT_LONG64 ) && !defined( FT_CONFIG_OPTION_FORCE_INT64 ) +#if defined(FT_LONG64) && !defined(FT_CONFIG_OPTION_FORCE_INT64) #ifdef __STDC__ @@ -363,7 +363,7 @@ FT_BEGIN_HEADER #define FT_BEGIN_STMNT do { -#define FT_END_STMNT } while ( 0 ) +#define FT_END_STMNT } while (0) #define FT_DUMMY_STMNT FT_BEGIN_STMNT FT_END_STMNT @@ -371,15 +371,15 @@ FT_BEGIN_HEADER /* Provide assembler fragments for performance-critical functions. */ /* These must be defined `static __inline__' with GCC. */ -#if defined( __CC_ARM ) || defined( __ARMCC__ ) /* RVCT */ +#if defined(__CC_ARM) || defined(__ARMCC__) /* RVCT */ #define FT_MULFIX_ASSEMBLER FT_MulFix_arm /* documentation is in freetype.h */ static __inline FT_Int32 - FT_MulFix_arm( FT_Int32 a, - FT_Int32 b ) + FT_MulFix_arm(FT_Int32 a, + FT_Int32 b) { register FT_Int32 t, t2; @@ -402,17 +402,17 @@ FT_BEGIN_HEADER #ifdef __GNUC__ -#if defined( __arm__ ) && \ - ( !defined( __thumb__ ) || defined( __thumb2__ ) ) && \ - !( defined( __CC_ARM ) || defined( __ARMCC__ ) ) +#if defined(__arm__) && \ + (!defined(__thumb__) || defined(__thumb2__)) && \ + !(defined(__CC_ARM) || defined(__ARMCC__)) #define FT_MULFIX_ASSEMBLER FT_MulFix_arm /* documentation is in freetype.h */ static __inline__ FT_Int32 - FT_MulFix_arm( FT_Int32 a, - FT_Int32 b ) + FT_MulFix_arm(FT_Int32 a, + FT_Int32 b) { register FT_Int32 t, t2; @@ -431,24 +431,24 @@ FT_BEGIN_HEADER "orr %0, %0, %2, lsl #16\n\t" /* %0 |= %2 << 16 */ : "=r"(a), "=&r"(t2), "=&r"(t) : "r"(a), "r"(b) - : "cc" ); + : "cc"); return a; } #endif /* __arm__ && */ - /* ( __thumb2__ || !__thumb__ ) && */ - /* !( __CC_ARM || __ARMCC__ ) */ + /* (__thumb2__ || !__thumb__) && */ + /* !(__CC_ARM || __ARMCC__) */ -#if defined( __i386__ ) +#if defined(__i386__) #define FT_MULFIX_ASSEMBLER FT_MulFix_i386 /* documentation is in freetype.h */ static __inline__ FT_Int32 - FT_MulFix_i386( FT_Int32 a, - FT_Int32 b ) + FT_MulFix_i386(FT_Int32 a, + FT_Int32 b) { register FT_Int32 result; @@ -465,7 +465,7 @@ FT_BEGIN_HEADER "addl %%edx, %%eax\n" : "=a"(result), "=d"(b) : "a"(a), "d"(b) - : "%ecx", "cc" ); + : "%ecx", "cc"); return result; } @@ -483,8 +483,8 @@ FT_BEGIN_HEADER /* documentation is in freetype.h */ static __inline FT_Int32 - FT_MulFix_i386( FT_Int32 a, - FT_Int32 b ) + FT_MulFix_i386(FT_Int32 a, + FT_Int32 b) { register FT_Int32 result; @@ -511,17 +511,17 @@ FT_BEGIN_HEADER #endif /* _MSC_VER */ -#if defined( __GNUC__ ) && defined( __x86_64__ ) +#if defined(__GNUC__) && defined(__x86_64__) #define FT_MULFIX_ASSEMBLER FT_MulFix_x86_64 static __inline__ FT_Int32 - FT_MulFix_x86_64( FT_Int32 a, - FT_Int32 b ) + FT_MulFix_x86_64(FT_Int32 a, + FT_Int32 b) { /* Temporarily disable the warning that C90 doesn't support */ /* `long long'. */ -#if ( __GNUC__ > 4 ) || ( ( __GNUC__ == 4 ) && ( __GNUC_MINOR__ >= 6 ) ) +#if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 6)) #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wlong-long" #endif @@ -536,7 +536,7 @@ FT_BEGIN_HEADER tmp = ret >> 63; ret += 0x8000 + tmp; - return (FT_Int32)( ret >> 16 ); + return (FT_Int32)(ret >> 16); #else /* For some reason, GCC 4.6 on Ubuntu 12.04 generates invalid machine */ @@ -558,12 +558,12 @@ FT_BEGIN_HEADER "sar $16, %0\n" : "=&r"(result), "=&r"(wide_a) : "r"(wide_b) - : "cc" ); + : "cc"); return (FT_Int32)result; #endif -#if ( __GNUC__ > 4 ) || ( ( __GNUC__ == 4 ) && ( __GNUC_MINOR__ >= 6 ) ) +#if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 6)) #pragma GCC diagnostic pop #endif } @@ -582,31 +582,31 @@ FT_BEGIN_HEADER #ifdef FT_MAKE_OPTION_SINGLE_OBJECT -#define FT_LOCAL( x ) static x -#define FT_LOCAL_DEF( x ) static x +#define FT_LOCAL(x) static x +#define FT_LOCAL_DEF(x) static x #else #ifdef __cplusplus -#define FT_LOCAL( x ) extern "C" x -#define FT_LOCAL_DEF( x ) extern "C" x +#define FT_LOCAL(x) extern "C" x +#define FT_LOCAL_DEF(x) extern "C" x #else -#define FT_LOCAL( x ) extern x -#define FT_LOCAL_DEF( x ) x +#define FT_LOCAL(x) extern x +#define FT_LOCAL_DEF(x) x #endif #endif /* FT_MAKE_OPTION_SINGLE_OBJECT */ -#define FT_LOCAL_ARRAY( x ) extern const x -#define FT_LOCAL_ARRAY_DEF( x ) const x +#define FT_LOCAL_ARRAY(x) extern const x +#define FT_LOCAL_ARRAY_DEF(x) const x #ifndef FT_BASE #ifdef __cplusplus -#define FT_BASE( x ) extern "C" x +#define FT_BASE(x) extern "C" x #else -#define FT_BASE( x ) extern x +#define FT_BASE(x) extern x #endif #endif /* !FT_BASE */ @@ -615,9 +615,9 @@ FT_BEGIN_HEADER #ifndef FT_BASE_DEF #ifdef __cplusplus -#define FT_BASE_DEF( x ) x +#define FT_BASE_DEF(x) x #else -#define FT_BASE_DEF( x ) x +#define FT_BASE_DEF(x) x #endif #endif /* !FT_BASE_DEF */ @@ -626,9 +626,9 @@ FT_BEGIN_HEADER #ifndef FT_EXPORT #ifdef __cplusplus -#define FT_EXPORT( x ) extern "C" x +#define FT_EXPORT(x) extern "C" x #else -#define FT_EXPORT( x ) extern x +#define FT_EXPORT(x) extern x #endif #endif /* !FT_EXPORT */ @@ -637,9 +637,9 @@ FT_BEGIN_HEADER #ifndef FT_EXPORT_DEF #ifdef __cplusplus -#define FT_EXPORT_DEF( x ) extern "C" x +#define FT_EXPORT_DEF(x) extern "C" x #else -#define FT_EXPORT_DEF( x ) extern x +#define FT_EXPORT_DEF(x) extern x #endif #endif /* !FT_EXPORT_DEF */ @@ -648,9 +648,9 @@ FT_BEGIN_HEADER #ifndef FT_EXPORT_VAR #ifdef __cplusplus -#define FT_EXPORT_VAR( x ) extern "C" x +#define FT_EXPORT_VAR(x) extern "C" x #else -#define FT_EXPORT_VAR( x ) extern x +#define FT_EXPORT_VAR(x) extern x #endif #endif /* !FT_EXPORT_VAR */ @@ -680,9 +680,9 @@ FT_BEGIN_HEADER /* */ #ifndef FT_CALLBACK_DEF #ifdef __cplusplus -#define FT_CALLBACK_DEF( x ) extern "C" x +#define FT_CALLBACK_DEF(x) extern "C" x #else -#define FT_CALLBACK_DEF( x ) static x +#define FT_CALLBACK_DEF(x) static x #endif #endif /* FT_CALLBACK_DEF */ diff --git a/include/freetype/config/ftmodule.h b/include/freetype/config/ftmodule.h index d1b938b..2933775 100644 --- a/include/freetype/config/ftmodule.h +++ b/include/freetype/config/ftmodule.h @@ -1,22 +1,22 @@ /* This is a generated file. */ -FT_USE_MODULE( FT_Driver_ClassRec, tt_driver_class ) -FT_USE_MODULE( FT_Driver_ClassRec, t1_driver_class ) -FT_USE_MODULE( FT_Driver_ClassRec, cff_driver_class ) -FT_USE_MODULE( FT_Driver_ClassRec, t1cid_driver_class ) -FT_USE_MODULE( FT_Driver_ClassRec, pfr_driver_class ) -FT_USE_MODULE( FT_Driver_ClassRec, t42_driver_class ) -FT_USE_MODULE( FT_Driver_ClassRec, winfnt_driver_class ) -FT_USE_MODULE( FT_Driver_ClassRec, pcf_driver_class ) -FT_USE_MODULE( FT_Driver_ClassRec, bdf_driver_class ) -FT_USE_MODULE( FT_Module_Class, sfnt_module_class ) -FT_USE_MODULE( FT_Module_Class, autofit_module_class ) -FT_USE_MODULE( FT_Module_Class, pshinter_module_class ) -FT_USE_MODULE( FT_Renderer_Class, ft_raster1_renderer_class ) -FT_USE_MODULE( FT_Renderer_Class, ft_smooth_renderer_class ) -FT_USE_MODULE( FT_Renderer_Class, ft_smooth_lcd_renderer_class ) -FT_USE_MODULE( FT_Renderer_Class, ft_smooth_lcdv_renderer_class ) -FT_USE_MODULE( FT_Module_Class, gxv_module_class ) -FT_USE_MODULE( FT_Module_Class, otv_module_class ) -FT_USE_MODULE( FT_Module_Class, psaux_module_class ) -FT_USE_MODULE( FT_Module_Class, psnames_module_class ) +FT_USE_MODULE(FT_Driver_ClassRec, tt_driver_class) +FT_USE_MODULE(FT_Driver_ClassRec, t1_driver_class) +FT_USE_MODULE(FT_Driver_ClassRec, cff_driver_class) +FT_USE_MODULE(FT_Driver_ClassRec, t1cid_driver_class) +FT_USE_MODULE(FT_Driver_ClassRec, pfr_driver_class) +FT_USE_MODULE(FT_Driver_ClassRec, t42_driver_class) +FT_USE_MODULE(FT_Driver_ClassRec, winfnt_driver_class) +FT_USE_MODULE(FT_Driver_ClassRec, pcf_driver_class) +FT_USE_MODULE(FT_Driver_ClassRec, bdf_driver_class) +FT_USE_MODULE(FT_Module_Class, sfnt_module_class) +FT_USE_MODULE(FT_Module_Class, autofit_module_class) +FT_USE_MODULE(FT_Module_Class, pshinter_module_class) +FT_USE_MODULE(FT_Renderer_Class, ft_raster1_renderer_class) +FT_USE_MODULE(FT_Renderer_Class, ft_smooth_renderer_class) +FT_USE_MODULE(FT_Renderer_Class, ft_smooth_lcd_renderer_class) +FT_USE_MODULE(FT_Renderer_Class, ft_smooth_lcdv_renderer_class) +FT_USE_MODULE(FT_Module_Class, gxv_module_class) +FT_USE_MODULE(FT_Module_Class, otv_module_class) +FT_USE_MODULE(FT_Module_Class, psaux_module_class) +FT_USE_MODULE(FT_Module_Class, psnames_module_class) /* EOF */ diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h index 84eb8d0..87b0e1d 100644 --- a/include/freetype/config/ftoption.h +++ b/include/freetype/config/ftoption.h @@ -239,20 +239,20 @@ FT_BEGIN_HEADER /* Two macros are used within the FreeType source code to define */ /* exported library functions: FT_EXPORT and FT_EXPORT_DEF. */ /* */ - /* FT_EXPORT( return_type ) */ + /* FT_EXPORT(return_type) */ /* */ /* is used in a function declaration, as in */ /* */ - /* FT_EXPORT( FT_Error ) */ - /* FT_Init_FreeType( FT_Library* alibrary ); */ + /* FT_EXPORT(FT_Error) */ + /* FT_Init_FreeType(FT_Library* alibrary); */ /* */ /* */ - /* FT_EXPORT_DEF( return_type ) */ + /* FT_EXPORT_DEF(return_type) */ /* */ /* is used in a function definition, as in */ /* */ - /* FT_EXPORT_DEF( FT_Error ) */ - /* FT_Init_FreeType( FT_Library* alibrary ) */ + /* FT_EXPORT_DEF(FT_Error) */ + /* FT_Init_FreeType(FT_Library* alibrary) */ /* { */ /* ... some code ... */ /* return FT_Err_Ok; */ @@ -637,7 +637,7 @@ FT_BEGIN_HEADER /* open_args.num_params = 1; */ /* open_args.params = ¶meter; */ /* */ - /* error = FT_Open_Face( library, &open_args, index, &face ); */ + /* error = FT_Open_Face(library, &open_args, index, &face); */ /* ... */ /* } */ /* */ diff --git a/include/freetype/config/ftstdlib.h b/include/freetype/config/ftstdlib.h index b940efc..ae63522 100644 --- a/include/freetype/config/ftstdlib.h +++ b/include/freetype/config/ftstdlib.h @@ -159,7 +159,7 @@ /* on certain platforms */ #define ft_longjmp longjmp -#define ft_setjmp( b ) setjmp( *(ft_jmp_buf*) &(b) ) /* same thing here */ +#define ft_setjmp(b) setjmp(*(ft_jmp_buf*) &(b)) /* same thing here */ /* the following is only used for debugging purposes, i.e., if */ |