summaryrefslogtreecommitdiff
path: root/community-staging/megaglest/lol.patch
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2012-10-23 01:37:15 -0700
committerroot <root@rshg054.dnsready.net>2012-10-23 01:37:15 -0700
commit3c19af9355ba86a5b99d6e5a57ecaa68a7ea6e8e (patch)
tree8fac31deec086251b3b9dc8faddfe14f5667392b /community-staging/megaglest/lol.patch
parent99746708edfd2c56f2ba654a14f27e98b1601a43 (diff)
Tue Oct 23 01:37:02 PDT 2012
Diffstat (limited to 'community-staging/megaglest/lol.patch')
-rw-r--r--community-staging/megaglest/lol.patch43
1 files changed, 43 insertions, 0 deletions
diff --git a/community-staging/megaglest/lol.patch b/community-staging/megaglest/lol.patch
new file mode 100644
index 000000000..56f94c852
--- /dev/null
+++ b/community-staging/megaglest/lol.patch
@@ -0,0 +1,43 @@
+diff --git a/source/shared_lib/include/graphics/math_util.h b/source/shared_lib/include/graphics/math_util.h
+index 8fcfb27..3cb7a41 100644
+--- a/source/shared_lib/include/graphics/math_util.h
++++ b/source/shared_lib/include/graphics/math_util.h
+@@ -184,10 +184,10 @@ public:
+
+ 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{
+diff --git a/source/shared_lib/sources/platform/posix/ircclient.cpp b/source/shared_lib/sources/platform/posix/ircclient.cpp
+index b09c972..ddebd03 100644
+--- a/source/shared_lib/sources/platform/posix/ircclient.cpp
++++ b/source/shared_lib/sources/platform/posix/ircclient.cpp
+@@ -13,6 +13,7 @@
+ #include "ircclient.h"
+ #include "util.h"
+ #include "platform_common.h"
++#include "libirc_rfcnumeric.h"
+ #include "libircclient.h"
+
+ #include <stdio.h>
+diff --git a/source/shared_lib/sources/util/util.cpp b/source/shared_lib/sources/util/util.cpp
+index 05478fc..c27aa62 100644
+--- a/source/shared_lib/sources/util/util.cpp
++++ b/source/shared_lib/sources/util/util.cpp
+@@ -19,6 +19,7 @@
+ #include <stdarg.h>
+ #include <time.h>
+ #include <fcntl.h> // for open()
++#include <unistd.h>
+
+ #ifdef WIN32
+ #include <io.h> // for open()