Merge pull request #68 from biodranik/warning-fix

Fixed duplicated macro warning for enabled Unity builds

Author: sammycage

source/plutovg-ft-math.c

@@ -46,17 +46,14 @@ static inline int clz(unsigned int x) {
 #define PVG_FT_PAD_ROUND(x, n) PVG_FT_PAD_FLOOR((x) + ((n) / 2), n)
 #define PVG_FT_PAD_CEIL(x, n) PVG_FT_PAD_FLOOR((x) + ((n)-1), n)
 
-#define PVG_FT_BEGIN_STMNT do {
-#define PVG_FT_END_STMNT } while (0)
-
 /* transfer sign leaving a positive number */
 #define PVG_FT_MOVE_SIGN(x, s) \
-    PVG_FT_BEGIN_STMNT         \
-    if (x < 0) {              \
-        x = -x;               \
-        s = -s;               \
-    }                         \
-    PVG_FT_END_STMNT
+    do {                       \
+      if (x < 0) {             \
+          x = -x;              \
+          s = -s;              \
+      }                        \
+    } while (0)
 
 PVG_FT_Long PVG_FT_MulFix(PVG_FT_Long a, PVG_FT_Long b)
 {

source/plutovg-ft-raster.c

@@ -58,9 +58,6 @@
 #include "plutovg-ft-raster.h"
 #include "plutovg-ft-math.h"
 
-#define PVG_FT_BEGIN_STMNT  do {
-#define PVG_FT_END_STMNT    } while ( 0 )
-
 #include <setjmp.h>
 
 #define pvg_ft_setjmp   setjmp
@@ -109,15 +106,15 @@ typedef ptrdiff_t  PVG_FT_PtrDist;
 /* remainder, cast to a specific type.  This macro also ensures that */
 /* the remainder is always positive.                                 */
 #define PVG_FT_DIV_MOD( type, dividend, divisor, quotient, remainder ) \
-PVG_FT_BEGIN_STMNT                                                   \
-  (quotient)  = (type)( (dividend) / (divisor) );                \
-  (remainder) = (type)( (dividend) % (divisor) );                \
-  if ( (remainder) < 0 )                                         \
-  {                                                              \
-    (quotient)--;                                                \
-    (remainder) += (type)(divisor);                              \
-  }                                                              \
-PVG_FT_END_STMNT
+  do {                                                                 \
+    (quotient)  = (type)( (dividend) / (divisor) );                    \
+    (remainder) = (type)( (dividend) % (divisor) );                    \
+    if ( (remainder) < 0 )                                             \
+    {                                                                  \
+      (quotient)--;                                                    \
+      (remainder) += (type)(divisor);                                  \
+    }                                                                  \
+  } while ( 0 )
 
   /* These macros speed up repetitive divisions by replacing them */
   /* with multiplications and right shifts.                       */