[vegastrike] Fix building with gcc-4.7
Hans de Goede
jwrdegoede at fedoraproject.org
Tue Jan 17 19:55:18 UTC 2012
commit 53755e03470ed04ae6d7880c7923a7755c66914f
Author: Hans de Goede <hdegoede at redhat.com>
Date: Tue Jan 17 20:57:11 2012 +0100
Fix building with gcc-4.7
vegastrike-0.5.1-gcc47.patch | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
---
diff --git a/vegastrike-0.5.1-gcc47.patch b/vegastrike-0.5.1-gcc47.patch
new file mode 100644
index 0000000..23c4f4a
--- /dev/null
+++ b/vegastrike-0.5.1-gcc47.patch
@@ -0,0 +1,23 @@
+diff -up vegastrike-src-0.5.1.beta1/src/resizable.h~ vegastrike-src-0.5.1.beta1/src/resizable.h
+--- vegastrike-src-0.5.1.beta1/src/resizable.h~ 2010-02-25 15:26:53.000000000 +0100
++++ vegastrike-src-0.5.1.beta1/src/resizable.h 2012-01-17 19:27:12.953863482 +0100
+@@ -1,4 +1,5 @@
+ #include <cstdlib>
++#include <cstring>
+ template < class ITEM >
+ class Resizable
+ {
+diff -up vegastrike-src-0.5.1.beta1/src/cmd/unit_jump.h~ vegastrike-src-0.5.1.beta1/src/cmd/unit_jump.h
+--- vegastrike-src-0.5.1.beta1/src/cmd/unit_jump.h~ 2010-12-15 09:53:40.000000000 +0100
++++ vegastrike-src-0.5.1.beta1/src/cmd/unit_jump.h 2012-01-17 20:16:33.875846863 +0100
+@@ -123,8 +123,8 @@ bool GameUnit< UnitType >::TransferUnitT
+ (tester = *i) != NULL; ++i)
+ if (tester->isUnit() == UNITPTR && tester != this)
+ if ( ( this->LocalPosition()-tester->LocalPosition() ).Magnitude() < this->rSize()+tester->rSize() )
+- SetCurPosition( this->LocalPosition()+this->cumulative_transformation_matrix.getR()
+- *( 4*( this->rSize()+tester->rSize() ) ) );
++ this->SetCurPosition( this->LocalPosition()+this->cumulative_transformation_matrix.getR()
++ *( 4*( this->rSize()+tester->rSize() ) ) );
+ DealPossibleJumpDamage( this );
+ static int jumparrive = AUDCreateSound( vs_config->getVariable( "unitaudio", "jumparrive", "sfx43.wav" ), false );
+ if (dosightandsound)
More information about the scm-commits
mailing list