Rev 228 | Details | Compare with Previous | Last modification | View Log | RSS feed
| Rev | Author | Line No. | Line |
|---|---|---|---|
| 228 | holmgren | 1 | Subject: FreeType: Fix compilation with Freetype 2.6. |
| 2 | Freetype 2.6 defines a conflicting TYPEOF() macro. |
||
| 3 | Author: Henrik Grubbström (Grubba) <grubba@grubba.org> |
||
| 4 | Origin: upstream, commit d6fdab268453ff78fe00ebc4f75cab6630c54635 |
||
| 5 | |||
| 6 | --- a/src/modules/_Image_FreeType/freetype.c |
||
| 7 | +++ b/src/modules/_Image_FreeType/freetype.c |
||
| 8 | @@ -5,9 +5,6 @@ |
||
| 9 | */ |
||
| 10 | |||
| 11 | #include "config.h" |
||
| 12 | -#include "global.h" |
||
| 13 | -#include "module.h" |
||
| 14 | -#include "pike_error.h" |
||
| 15 | |||
| 16 | #ifdef HAVE_LIBFT2 |
||
| 17 | #ifndef HAVE_FT_FT2BUILD |
||
| 18 | @@ -21,6 +18,13 @@ |
||
| 19 | #include FT_TRUETYPE_IDS_H |
||
| 20 | #endif |
||
| 21 | |||
| 22 | +/* Freetype 2.6 defines a conflicting TYPEOF() macro. */ |
||
| 23 | +#undef TYPEOF |
||
| 24 | +#endif /* HAVE_LIBFT2 */ |
||
| 25 | + |
||
| 26 | +#include "global.h" |
||
| 27 | +#include "module.h" |
||
| 28 | +#include "pike_error.h" |
||
| 29 | #include "pike_macros.h" |
||
| 30 | #include "object.h" |
||
| 31 | #include "constants.h" |
||
| 32 | @@ -34,7 +38,6 @@ |
||
| 33 | #include "module_support.h" |
||
| 34 | #include "operators.h" |
||
| 35 | #include "../Image/image.h" |
||
| 36 | -#endif /* HAVE_LIBFT2 */ |
||
| 37 | |||
| 38 | |||
| 39 | #ifdef HAVE_LIBFT2 |