diff options
author | Steve Price <steve@FreeBSD.org> | 2000-02-27 23:21:48 +0000 |
---|---|---|
committer | Steve Price <steve@FreeBSD.org> | 2000-02-27 23:21:48 +0000 |
commit | b42ca1d4466262ef9fb3fbd25ba3a77ce6a47cbf (patch) | |
tree | fc9643862009d76f077f0f55e42d75fc1d65da86 /games/xspacewarp | |
parent | - Don't tromple the contents of MAKE_ENV otherwise MOTIF_LIB isn't defined. (diff) |
Fix build errors on -current.
Notes
Notes:
svn path=/head/; revision=26394
Diffstat (limited to 'games/xspacewarp')
-rw-r--r-- | games/xspacewarp/files/patch-aa | 11 | ||||
-rw-r--r-- | games/xspacewarp/files/patch-ab | 101 | ||||
-rw-r--r-- | games/xspacewarp/files/patch-ac | 15 |
3 files changed, 127 insertions, 0 deletions
diff --git a/games/xspacewarp/files/patch-aa b/games/xspacewarp/files/patch-aa new file mode 100644 index 000000000000..ed3b8c118622 --- /dev/null +++ b/games/xspacewarp/files/patch-aa @@ -0,0 +1,11 @@ +--- c_endever.hh.orig Sun Feb 27 12:21:09 2000 ++++ c_endever.hh Sun Feb 27 12:21:27 2000 +@@ -35,7 +35,7 @@ + bool nomove() const {return (nomoveflag);} + void setnomove(bool nm) {nomoveflag = nm;} + static void seticon(const char *str); +- static geticon_len(); ++ static int geticon_len(); + private: + int torpedoes; + bool docked; // whether docked to a base diff --git a/games/xspacewarp/files/patch-ab b/games/xspacewarp/files/patch-ab new file mode 100644 index 000000000000..95f91e2ed765 --- /dev/null +++ b/games/xspacewarp/files/patch-ab @@ -0,0 +1,101 @@ +--- xprep.hh.orig Sun Feb 27 12:22:21 2000 ++++ xprep.hh Sun Feb 27 12:27:25 2000 +@@ -194,7 +194,7 @@ + sizeof(Boolean), + XtOffsetOf(AppData, nomouse), + XtRString, +- "False" ++ (XtPointer) "False" + }, + { + XtNrows, +@@ -365,7 +365,7 @@ + sizeof(Pixel), + XtOffsetOf(AppData, foreground), + XtRString, +- XtDefaultForeground ++ (XtPointer) XtDefaultForeground + }, + { + XtNbackground, +@@ -374,7 +374,7 @@ + sizeof(Pixel), + XtOffsetOf(AppData, background), + XtRString, +- XtDefaultBackground ++ (XtPointer) XtDefaultBackground + }, + { + XtNendeverColor, +@@ -383,7 +383,7 @@ + sizeof(Pixel), + XtOffsetOf(AppData, endever_color), + XtRString, +- XtDefaultForeground ++ (XtPointer) XtDefaultForeground + }, + { + XtNendeverIcon, +@@ -401,7 +401,7 @@ + sizeof(Pixel), + XtOffsetOf(AppData, jovian_color), + XtRString, +- XtDefaultForeground ++ (XtPointer) XtDefaultForeground + }, + { + XtNjovianIcon, +@@ -419,7 +419,7 @@ + sizeof(Pixel), + XtOffsetOf(AppData, base_color), + XtRString, +- XtDefaultForeground ++ (XtPointer) XtDefaultForeground + }, + { + XtNbaseIcon, +@@ -437,7 +437,7 @@ + sizeof(Pixel), + XtOffsetOf(AppData, star_color), + XtRString, +- XtDefaultForeground ++ (XtPointer) XtDefaultForeground + }, + { + XtNstarIcon, +@@ -455,7 +455,7 @@ + sizeof(Pixel), + XtOffsetOf(AppData, blackhole_color), + XtRString, +- XtDefaultForeground ++ (XtPointer) XtDefaultForeground + }, + { + XtNblackholeIcon, +@@ -473,7 +473,7 @@ + sizeof(Pixel), + XtOffsetOf(AppData, faser_color), + XtRString, +- XtDefaultForeground ++ (XtPointer) XtDefaultForeground + }, + { + XtNfaserWidth, +@@ -518,7 +518,7 @@ + sizeof(Pixel), + XtOffsetOf(AppData, torpedo_color), + XtRString, +- XtDefaultForeground ++ (XtPointer) XtDefaultForeground + }, + { + XtNtorpedoWidth, +@@ -554,7 +554,7 @@ + sizeof(Pixel), + XtOffsetOf(AppData, explosion_color), + XtRString, +- XtDefaultForeground ++ (XtPointer) XtDefaultForeground + }, + { + XtNexplosionSpeed, diff --git a/games/xspacewarp/files/patch-ac b/games/xspacewarp/files/patch-ac new file mode 100644 index 000000000000..27a9c80ed361 --- /dev/null +++ b/games/xspacewarp/files/patch-ac @@ -0,0 +1,15 @@ +--- c_jovian.cc.orig Fri Dec 29 01:41:56 1995 ++++ c_jovian.cc Sun Feb 27 12:30:41 2000 +@@ -22,10 +22,12 @@ + + // these AI functions are kept in separate file c_jovian_ai.cc + ++#if 0 + extern Action Jovian::pick_action(); + extern Direction Jovian::pick_direction(); + extern Ucoors Jovian::pick_sector(); + extern Point Jovian::pick_target(); ++#endif + + + Jovian::Jovian(): Combatant() |