| Index: include/freetype/internal/ftrfork.h
|
| diff --git a/include/freetype/internal/ftrfork.h b/include/freetype/internal/ftrfork.h
|
| index 77e10206a358226187f471b3c09498e9822c0d6e..6307f2d0c5ae1a95c1edf56661415ffa84ebb59d 100644
|
| --- a/include/freetype/internal/ftrfork.h
|
| +++ b/include/freetype/internal/ftrfork.h
|
| @@ -4,7 +4,7 @@
|
| /* */
|
| /* Embedded resource forks accessor (specification). */
|
| /* */
|
| -/* Copyright 2004, 2006, 2007 by */
|
| +/* Copyright 2004, 2006, 2007, 2012 by */
|
| /* Masatake YAMATO and Redhat K.K. */
|
| /* */
|
| /* This file is part of the FreeType project, and may only be used, */
|
| @@ -80,26 +80,37 @@ FT_BEGIN_HEADER
|
| } ft_raccess_guess_rec;
|
|
|
| #ifndef FT_CONFIG_OPTION_PIC
|
| +
|
| /* this array is a storage in non-PIC mode, so ; is needed in END */
|
| -#define CONST_FT_RFORK_RULE_ARRAY_BEGIN( name, type ) \
|
| - const type name[] = {
|
| -#define CONST_FT_RFORK_RULE_ARRAY_ENTRY( func_suffix, type_suffix ) \
|
| - { raccess_guess_##func_suffix, FT_RFork_Rule_##type_suffix },
|
| -#define CONST_FT_RFORK_RULE_ARRAY_END };
|
| +#define CONST_FT_RFORK_RULE_ARRAY_BEGIN( name, type ) \
|
| + const type name[] = {
|
| +#define CONST_FT_RFORK_RULE_ARRAY_ENTRY( func_suffix, type_suffix ) \
|
| + { raccess_guess_ ## func_suffix, \
|
| + FT_RFork_Rule_ ## type_suffix },
|
| +#define CONST_FT_RFORK_RULE_ARRAY_END };
|
| +
|
| #else /* FT_CONFIG_OPTION_PIC */
|
| +
|
| /* this array is a function in PIC mode, so no ; is needed in END */
|
| -#define CONST_FT_RFORK_RULE_ARRAY_BEGIN( name, type ) \
|
| - void FT_Init_##name ( type* storage ) { \
|
| - type *local = storage; \
|
| - int i = 0;
|
| -#define CONST_FT_RFORK_RULE_ARRAY_ENTRY( func_suffix, type_suffix ) \
|
| - local[i].func = raccess_guess_##func_suffix; \
|
| - local[i].type = FT_RFork_Rule_##type_suffix; \
|
| - i++;
|
| -#define CONST_FT_RFORK_RULE_ARRAY_END }
|
| +#define CONST_FT_RFORK_RULE_ARRAY_BEGIN( name, type ) \
|
| + void \
|
| + FT_Init_ ## name( type* storage ) \
|
| + { \
|
| + type* local = storage; \
|
| + \
|
| + \
|
| + int i = 0;
|
| +#define CONST_FT_RFORK_RULE_ARRAY_ENTRY( func_suffix, type_suffix ) \
|
| + local[i].func = raccess_guess_ ## func_suffix; \
|
| + local[i].type = FT_RFork_Rule_ ## type_suffix; \
|
| + i++;
|
| +#define CONST_FT_RFORK_RULE_ARRAY_END }
|
| +
|
| #endif /* FT_CONFIG_OPTION_PIC */
|
| +
|
| #endif /* FT_CONFIG_OPTION_GUESSING_EMBEDDED_RFORK */
|
|
|
| +
|
| /*************************************************************************/
|
| /* */
|
| /* <Function> */
|
|
|