From a7f73321d5892f9fe5aab0c134c72805db6475f6 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Wed, 29 Apr 2020 00:01:30 +0200 Subject: [PATCH] GRAPHICS: Fix clash with Amiga #define --- graphics/fonts/macfont.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/graphics/fonts/macfont.cpp b/graphics/fonts/macfont.cpp index 8f039bc5cd6..32817d064e7 100644 --- a/graphics/fonts/macfont.cpp +++ b/graphics/fonts/macfont.cpp @@ -611,7 +611,7 @@ MacFONTFont *MacFONTFont::scaleFont(const MacFONTFont *src, int newSize, bool bo return new MacFONTFont(data); } -#define howmany(x, y) (((x)+((y)-1))/(y)) +#define wholedivide(x, y) (((x)+((y)-1))/(y)) static void countupScore(int *dstGray, int x, int y, int bbw, int bbh, float scale) { int newbbw = bbw * scale; @@ -623,8 +623,8 @@ static void countupScore(int *dstGray, int x, int y, int bbw, int bbh, float sca int newxbegin = x_ / bbw; int newybegin = y_ / bbh; - int newxend = howmany(x1, bbw); - int newyend = howmany(y1, bbh); + int newxend = wholedivide(x1, bbw); + int newyend = wholedivide(y1, bbh); for (int newy = newybegin; newy < newyend; newy++) { for (int newx = newxbegin; newx < newxend; newx++) {