[Scummvm-git-logs] scummvm master -> a7f73321d5892f9fe5aab0c134c72805db6475f6

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
a7f73321d5 GRAPHICS: Fix clash with Amiga #define


Commit: a7f73321d5892f9fe5aab0c134c72805db6475f6
    https://github.com/scummvm/scummvm/commit/a7f73321d5892f9fe5aab0c134c72805db6475f6
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-04-29T00:01:30+02:00

Commit Message:
GRAPHICS: Fix clash with Amiga #define

Changed paths:
    graphics/fonts/macfont.cpp


diff --git a/graphics/fonts/macfont.cpp b/graphics/fonts/macfont.cpp
index 8f039bc5cd..32817d064e 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++) {