NoIssue - wrap max function in conditional define.

davetcc · davetcc · commit 19cc54ab26ec · 2024-09-15T09:12:07.000+01:00
diff --git a/src/tcUnicodeHelper.cpp b/src/tcUnicodeHelper.cpp
@@ -28,7 +28,9 @@ Coord UnicodeFontHandler::textExtents(const char *text, int *baseline, bool prog
     return Coord((int)xExtentCurrent, getYAdvance());
 }
 
+#ifndef internal_max
 #define internal_max(a, b)  ((a) < (b) ? (b) : (a));
+#endif // internal_max
 
 void UnicodeFontHandler::writeUnicode(uint32_t unicodeText) {
     // make sure it's printable.

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,9 @@ Coord UnicodeFontHandler::textExtents(const char text, int baseline, bool prog`
`28`	`28`	`return Coord((int)xExtentCurrent, getYAdvance());`
`29`	`29`	`}`
`30`	`30`
	`31`	`+#ifndef internal_max`
`31`	`32`	`#define internal_max(a, b) ((a) < (b) ? (b) : (a));`
	`33`	`+#endif // internal_max`
`32`	`34`
`33`	`35`	`void UnicodeFontHandler::writeUnicode(uint32_t unicodeText) {`
`34`	`36`	`// make sure it's printable.`