Attachment 159544 Details for Bug 202083 – patch to change TYPEOF into FT_TYPEOF

[patch] patch to change TYPEOF into FT_TYPEOF

patch-graphics_freetype2-TYPEOF.diff (text/plain), 3.90 KB, created by Rainer Hurling on 2015-08-04 17:35:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rainer Hurling

Created: 2015-08-04 17:35:43 UTC

Size: 3.90 KB

patch

obsolete

>diff -urN freetype2.orig/files/patch-builds_unix_ftconfig.in freetype2/files/patch-builds_unix_ftconfig.in
>--- freetype2.orig/files/patch-builds_unix_ftconfig.in	1970-01-01 01:00:00.000000000 +0100
>+++ freetype2/files/patch-builds_unix_ftconfig.in	2015-08-04 18:51:21.477087000 +0200
>@@ -0,0 +1,14 @@
>+--- builds/unix/ftconfig.in.orig	2015-06-07 14:10:16 UTC
>++++ builds/unix/ftconfig.in
>+@@ -365,9 +365,9 @@ FT_BEGIN_HEADER
>+ #if ( __GNUC__ >= 2                         || \
>+       defined( __IBM__TYPEOF__ )            || \
>+       ( __SUNPRO_C >= 0x5110 && !__STDC__ ) )
>+-#define TYPEOF( type )  (__typeof__ (type))
>++#define FT_TYPEOF( type )  (__typeof__ (type))
>+ #else
>+-#define TYPEOF( type )  /* empty */
>++#define FT_TYPEOF( type )  /* empty */
>+ #endif
>+ 
>+ 
>diff -urN freetype2.orig/files/patch-builds_vms_ftconfig.h freetype2/files/patch-builds_vms_ftconfig.h
>--- freetype2.orig/files/patch-builds_vms_ftconfig.h	1970-01-01 01:00:00.000000000 +0100
>+++ freetype2/files/patch-builds_vms_ftconfig.h	2015-08-04 18:51:21.489401000 +0200
>@@ -0,0 +1,14 @@
>+--- builds/vms/ftconfig.h.orig	2015-06-07 14:10:37 UTC
>++++ builds/vms/ftconfig.h
>+@@ -308,9 +308,9 @@ FT_BEGIN_HEADER
>+ #if ( __GNUC__ >= 2                         || \
>+       defined( __IBM__TYPEOF__ )            || \
>+       ( __SUNPRO_C >= 0x5110 && !__STDC__ ) )
>+-#define TYPEOF( type )  (__typeof__ (type))
>++#define FT_TYPEOF( type )  (__typeof__ (type))
>+ #else
>+-#define TYPEOF( type )  /* empty */
>++#define FT_TYPEOF( type )  /* empty */
>+ #endif
>+ 
>+ 
>diff -urN freetype2.orig/files/patch-include_config_ftconfig.h freetype2/files/patch-include_config_ftconfig.h
>--- freetype2.orig/files/patch-include_config_ftconfig.h	1970-01-01 01:00:00.000000000 +0100
>+++ freetype2/files/patch-include_config_ftconfig.h	2015-08-04 18:51:21.501854000 +0200
>@@ -0,0 +1,14 @@
>+--- include/config/ftconfig.h.orig	2015-06-07 08:23:30 UTC
>++++ include/config/ftconfig.h
>+@@ -335,9 +335,9 @@ FT_BEGIN_HEADER
>+ #if ( __GNUC__ >= 2                         || \
>+       defined( __IBM__TYPEOF__ )            || \
>+       ( __SUNPRO_C >= 0x5110 && !__STDC__ ) )
>+-#define TYPEOF( type )  (__typeof__ (type))
>++#define FT_TYPEOF( type )  (__typeof__ (type))
>+ #else
>+-#define TYPEOF( type )  /* empty */
>++#define FT_TYPEOF( type )  /* empty */
>+ #endif
>+ 
>+ 
>diff -urN freetype2.orig/files/patch-include_internal_ftobjs.h freetype2/files/patch-include_internal_ftobjs.h
>--- freetype2.orig/files/patch-include_internal_ftobjs.h	1970-01-01 01:00:00.000000000 +0100
>+++ freetype2/files/patch-include_internal_ftobjs.h	2015-08-04 18:51:21.514358000 +0200
>@@ -0,0 +1,16 @@
>+--- include/internal/ftobjs.h.orig	2015-03-11 05:47:11 UTC
>++++ include/internal/ftobjs.h
>+@@ -84,11 +84,11 @@ FT_BEGIN_HEADER
>+                   : y + ( 3 * x >> 3 ) )
>+ 
>+   /* we use the TYPEOF macro to suppress signedness compilation warnings */
>+-#define FT_PAD_FLOOR( x, n )  ( (x) & ~TYPEOF( x )( (n)-1 ) )
>++#define FT_PAD_FLOOR( x, n )  ( (x) & ~FT_TYPEOF( x )( (n)-1 ) )
>+ #define FT_PAD_ROUND( x, n )  FT_PAD_FLOOR( (x) + ((n)/2), n )
>+ #define FT_PAD_CEIL( x, n )   FT_PAD_FLOOR( (x) + ((n)-1), n )
>+ 
>+-#define FT_PIX_FLOOR( x )     ( (x) & ~TYPEOF( x )63 )
>++#define FT_PIX_FLOOR( x )     ( (x) & ~FT_TYPEOF( x )63 )
>+ #define FT_PIX_ROUND( x )     FT_PIX_FLOOR( (x) + 32 )
>+ #define FT_PIX_CEIL( x )      FT_PIX_FLOOR( (x) + 63 )
>+ 
>diff -urN freetype2.orig/files/patch-src_autofit_afwarp.h freetype2/files/patch-src_autofit_afwarp.h
>--- freetype2.orig/files/patch-src_autofit_afwarp.h	1970-01-01 01:00:00.000000000 +0100
>+++ freetype2/files/patch-src_autofit_afwarp.h	2015-08-04 18:51:21.526122000 +0200
>@@ -0,0 +1,11 @@
>+--- src/autofit/afwarp.h.orig	2015-03-11 05:47:11 UTC
>++++ src/autofit/afwarp.h
>+@@ -25,7 +25,7 @@ FT_BEGIN_HEADER
>+ 
>+ #define AF_WARPER_SCALE
>+ 
>+-#define AF_WARPER_FLOOR( x )  ( (x) & ~TYPEOF( x )63 )
>++#define AF_WARPER_FLOOR( x )  ( (x) & ~FT_TYPEOF( x )63 )
>+ #define AF_WARPER_CEIL( x )   AF_WARPER_FLOOR( (x) + 63 )
>+ 
>+

Actions: View | Diff

Attachments on bug 202083: 159544