diff options
| author |   Tristan Heaven <nyhm@gentoo.org> | 2007-07-02 19:23:28 +0000 |
|---|---|---|
| committer | Tristan Heaven <nyhm@gentoo.org> | 2007-07-02 19:23:28 +0000 |
| commit | d693def803b7ea373b2e04d53f69c76dafbcccac (patch) | |
| tree | 6db708aeef08f2603efb44125ec8e2db972668c5 /games-arcade/moagg/files | |
| parent | stable x86, bug 183879 (diff) | |
| download | gentoo-2-d693def803b7ea373b2e04d53f69c76dafbcccac.tar.gz gentoo-2-d693def803b7ea373b2e04d53f69c76dafbcccac.tar.bz2 gentoo-2-d693def803b7ea373b2e04d53f69c76dafbcccac.zip | |
gcc-4.2 patch from Debian
(Portage version: 2.1.3_rc6)
Diffstat (limited to 'games-arcade/moagg/files')
| -rw-r--r-- | games-arcade/moagg/files/moagg-0.18-gcc42.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/games-arcade/moagg/files/moagg-0.18-gcc42.patch b/games-arcade/moagg/files/moagg-0.18-gcc42.patch new file mode 100644 index 000000000000..11b03ace9b20 --- /dev/null +++ b/games-arcade/moagg/files/moagg-0.18-gcc42.patch @@ -0,0 +1,41 @@ +diff -ur moagg.old/libMoaggCore/include/Exception.h moagg-0.18/libMoaggCore/include/Exception.h +--- moagg.old/libMoaggCore/include/Exception.h 2005-04-17 09:40:18.000000000 +0000 ++++ moagg-0.18/libMoaggCore/include/Exception.h 2007-05-07 18:14:44.000000000 +0000 +@@ -1,7 +1,7 @@ + #ifndef EXCEPTION_H + #define EXCEPTION_H + +-#include <iosfwd> ++#include <iostream> + #include <string> + + //---------------------------------------------------------------------------- +diff -ur moagg.old/libMoaggCore/include/MathTools.h moagg-0.18/libMoaggCore/include/MathTools.h +--- moagg.old/libMoaggCore/include/MathTools.h 2005-04-17 09:40:18.000000000 +0000 ++++ moagg-0.18/libMoaggCore/include/MathTools.h 2007-05-07 18:24:52.000000000 +0000 +@@ -62,6 +62,8 @@ + double m_x; + double m_y; + }; ++ Vector operator+(const Vector &v1, const Vector &v2); ++ Vector operator-(const Vector &v1, const Vector &v2); + + + //------------------------------------------------------------------------ +diff -ur moagg.old/libMoaggCore/include/Tools.h moagg-0.18/libMoaggCore/include/Tools.h +--- moagg.old/libMoaggCore/include/Tools.h 2005-04-17 09:40:18.000000000 +0000 ++++ moagg-0.18/libMoaggCore/include/Tools.h 2007-05-16 19:08:35.000000000 +0000 +@@ -34,13 +34,8 @@ + + + //---------------------------------------------------------------------------- +-#if defined __GNUC__ && ! defined __LINT__ +-#define MIN(X, Y) ((X) <? (Y)) +-#define MAX(X, Y) ((X) >? (Y)) +-#else + #define MIN(X, Y) ((X) < (Y) ? (X) : (Y)) + #define MAX(X, Y) ((X) > (Y) ? (X) : (Y)) +-#endif //!__GNUC__ + + //---------------------------------------------------------------------------- + #define ZAP_POINTER(p) delete p; p = NULL; |