tags 672014 + patch thanks On 08/05/12 20:56, Matthias Klose wrote: > The build failure is exposed by building with gcc-4.7/g++-4.7, > which is now the default gcc/g++ on x86 archi
Please find attached a patch to fix this FTBFS. Regards -- Sebastian Ramacher
Index: megaglest-3.6.0.3/source/shared_lib/sources/util/util.cpp
===================================================================
--- megaglest-3.6.0.3.orig/source/shared_lib/sources/util/util.cpp 2012-05-13 00:18:02.000000000 +0200
+++ megaglest-3.6.0.3/source/shared_lib/sources/util/util.cpp 2012-05-13 00:18:02.000000000 +0200
@@ -33,6 +33,7 @@
#ifndef WIN32
#include <errno.h>
#endif
+#include <unistd.h>
#include "leak_dumper.h"
Index: megaglest-3.6.0.3/source/shared_lib/include/graphics/math_util.h
===================================================================
--- megaglest-3.6.0.3.orig/source/shared_lib/include/graphics/math_util.h 2011-12-14 08:40:48.000000000 +0100
+++ megaglest-3.6.0.3/source/shared_lib/include/graphics/math_util.h 2012-05-13 00:23:50.000000000 +0200
@@ -184,10 +184,10 @@
Rect2<T> computeBoundingRect() const{
return Rect2i(
- min(p[0].x, p[1].x),
- min(p[0].y, p[2].y),
- max(p[2].x, p[3].x),
- max(p[1].y, p[3].y));
+ std::min(p[0].x, p[1].x),
+ std::min(p[0].y, p[2].y),
+ std::max(p[2].x, p[3].x),
+ std::max(p[1].y, p[3].y));
}
bool isInside(const Vec2<T> &pt) const{
signature.asc
Description: OpenPGP digital signature
