Commit 5ccebc4e1eb71e5ee82a88edb9cd553e08fc69b9
2012-02-21T08:54:55
Prepare source code for amalgamation (2/6). * src/smooth/ftgrays.c, src/raster/ftraster.c: Undefine FLOOR, CEILING, TRUNC, and SCALED before defining it.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48
diff --git a/ChangeLog b/ChangeLog
index 5d05003..32ab1d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2012-02-20 Vinnie Falco <vinnie.falco@gmail.com>
+ Prepare source code for amalgamation (2/6).
+
+ * src/smooth/ftgrays.c, src/raster/ftraster.c: Undefine FLOOR,
+ CEILING, TRUNC, and SCALED before defining it.
+
+2012-02-20 Vinnie Falco <vinnie.falco@gmail.com>
+
Prepare source code for amalgamation (1/6).
See discussion starting at
diff --git a/src/raster/ftraster.c b/src/raster/ftraster.c
index 58bf179..fb78c0c 100644
--- a/src/raster/ftraster.c
+++ b/src/raster/ftraster.c
@@ -428,6 +428,10 @@
/* NOTE: These operations are only valid on 2's complement processors */
+#undef FLOOR
+#undef CEILING
+#undef TRUNC
+#undef SCALED
#define FLOOR( x ) ( (x) & -ras.precision )
#define CEILING( x ) ( ( (x) + ras.precision - 1 ) & -ras.precision )
diff --git a/src/smooth/ftgrays.c b/src/smooth/ftgrays.c
index a20009c..0837fc0 100644
--- a/src/smooth/ftgrays.c
+++ b/src/smooth/ftgrays.c
@@ -253,6 +253,11 @@ typedef ptrdiff_t FT_PtrDist;
/* must be at least 6 bits! */
#define PIXEL_BITS 8
+#undef FLOOR
+#undef CEILING
+#undef TRUNC
+#undef SCALED
+
#define ONE_PIXEL ( 1L << PIXEL_BITS )
#define PIXEL_MASK ( -1L << PIXEL_BITS )
#define TRUNC( x ) ( (TCoord)( (x) >> PIXEL_BITS ) )