ref: a07029ef5f2faf13dd030b4af3f1ae6d0b02ac0e
parent: 851e815127d47e85a575e1be7ff8cc265d5d7e79
author: Werner Lemberg <[email protected]>
date: Mon Mar 2 01:54:08 EST 2015
Simplify `TYPEOF' macro. No need for two arguments. * include/config/ftconfig.h, builds/unix/ftconfig.in, builds/vms/ftconfig.h (TYPEOF): Updated. * include/internal/ftobjs.h (FT_PAD_FLOOR, FT_PIX_FLOOR), src/autofit/afwarp.h (AF_WARPER_FLOOR): Updated.
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,16 @@
-2015-02-25 Werner Lemberg <[email protected]>
+2015-03-02 Werner Lemberg <[email protected]>
+
+ Simplify `TYPEOF' macro.
+
+ No need for two arguments.
+
+ * include/config/ftconfig.h, builds/unix/ftconfig.in,
+ builds/vms/ftconfig.h (TYPEOF): Updated.
+
+ * include/internal/ftobjs.h (FT_PAD_FLOOR, FT_PIX_FLOOR),
+ src/autofit/afwarp.h (AF_WARPER_FLOOR): Updated.
+
+2015-03-01 Werner Lemberg <[email protected]>
Various compiler warning fixes for `make multi'.
--- a/builds/unix/ftconfig.in
+++ b/builds/unix/ftconfig.in
@@ -366,9 +366,9 @@
#if ( __GNUC__ >= 2 || \
defined( __IBM__TYPEOF__ ) || \
( __SUNPRO_C >= 0x5110 && !__STDC__ ) )
-#define TYPEOF( type, x ) (__typeof__ (type))(x)
+#define TYPEOF( type ) (__typeof__ (type))
#else
-#define TYPEOF( type, x ) (x)
+#define TYPEOF( type ) /* empty */
#endif
--- a/builds/vms/ftconfig.h
+++ b/builds/vms/ftconfig.h
@@ -309,9 +309,9 @@
#if ( __GNUC__ >= 2 || \
defined( __IBM__TYPEOF__ ) || \
( __SUNPRO_C >= 0x5110 && !__STDC__ ) )
-#define TYPEOF( type, x ) (__typeof__ (type))(x)
+#define TYPEOF( type ) (__typeof__ (type))
#else
-#define TYPEOF( type, x ) (x)
+#define TYPEOF( type ) /* empty */
#endif
--- a/include/config/ftconfig.h
+++ b/include/config/ftconfig.h
@@ -336,9 +336,9 @@
#if ( __GNUC__ >= 2 || \
defined( __IBM__TYPEOF__ ) || \
( __SUNPRO_C >= 0x5110 && !__STDC__ ) )
-#define TYPEOF( type, x ) (__typeof__ (type))(x)
+#define TYPEOF( type ) (__typeof__ (type))
#else
-#define TYPEOF( type, x ) (x)
+#define TYPEOF( type ) /* empty */
#endif
--- a/include/internal/ftobjs.h
+++ b/include/internal/ftobjs.h
@@ -84,11 +84,11 @@
: 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) & ~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) & ~TYPEOF( x )63 )
#define FT_PIX_ROUND( x ) FT_PIX_FLOOR( (x) + 32 )
#define FT_PIX_CEIL( x ) FT_PIX_FLOOR( (x) + 63 )
--- a/src/autofit/afwarp.h
+++ b/src/autofit/afwarp.h
@@ -25,7 +25,7 @@
#define AF_WARPER_SCALE
-#define AF_WARPER_FLOOR( x ) ( (x) & ~TYPEOF( x, 63 ) )
+#define AF_WARPER_FLOOR( x ) ( (x) & ~TYPEOF( x )63 )
#define AF_WARPER_CEIL( x ) AF_WARPER_FLOOR( (x) + 63 )