Control: tags 831104 + pending
Dear maintainer,
I've prepared an NMU for xevil (versioned as 2.02r2-10.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer or cancel the NMU.
Regards,
Eriberto
--- xevil-2.02r2/debian/changelog
+++ xevil-2.02r2/debian/changelog
@@ -1,3 +1,11 @@
+xevil (2.02r2-10.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fixed FTBFS with GCC 6 and higher. Thanks to Javier Serrano
+ Polo <jav...@jasp.net>. (Closes: #831104)
+
+ -- Joao Eriberto Mota Filho <eribe...@debian.org> Sun, 07 Jun 2020 02:11:06
-0300
+
xevil (2.02r2-10) unstable; urgency=low
* Fixed bug that sometimes prevented X resources from being read properly.
diff -u xevil-2.02r2/cmn/utils.h xevil-2.02r2/cmn/utils.h
--- xevil-2.02r2/cmn/utils.h
+++ xevil-2.02r2/cmn/utils.h
@@ -98,11 +98,11 @@
#define MSEC_PER_CLOCK (1.0e3 / CLOCKS_PER_SEC)
#endif
-#ifndef max
-#define max(a,b) (a<b ? b : a)
+#ifndef MAX
+#define MAX(a,b) (a<b ? b : a)
#endif
-#ifndef min
-#define min(a,b) (a>b ? b : a)
+#ifndef MIN
+#define MIN(a,b) (a>b ? b : a)
#endif
#if X11
diff -u xevil-2.02r2/cmn/game.cpp xevil-2.02r2/cmn/game.cpp
--- xevil-2.02r2/cmn/game.cpp
+++ xevil-2.02r2/cmn/game.cpp
@@ -577,7 +577,7 @@
assert(maximums[weapons[n]->classId] == 0);
// Don't allow objectWorldPercent values that are too small.
- float objWPercent = (float)max(weapons[n]->objectWorldPercent,
+ float objWPercent = (float)MAX(weapons[n]->objectWorldPercent,
OBJECT_WORLD_PERCENT_MIN);
maximums[weapons[n]->classId] = (int)ceil(areaFactor * objWPercent);
@@ -590,7 +590,7 @@
for (n = 0; n < oItemsNum; n++) {
// Check not already set.
assert(maximums[oItems[n]->classId] == 0);
- float objWPercent = (float)max(oItems[n]->objectWorldPercent,
+ float objWPercent = (float)MAX(oItems[n]->objectWorldPercent,
OBJECT_WORLD_PERCENT_MIN);
maximums[oItems[n]->classId] = (int)ceil(areaFactor * objWPercent);
diff -u xevil-2.02r2/debian/changelog xevil-2.02r2/debian/changelog
