vegastrike/gcc46.patch

   1 Index: src/gfxlib.h
   2 ===================================================================
   3 --- src/gfxlib.h        (revision 13191)
   4 +++ src/gfxlib.h        (working copy)
   5 @@ -37,6 +37,7 @@
   6   * #include <GL/glut.h>
   7   * #endif
   8   #endif*/
   9 +#include <cstddef>
  10  #include <vector>
  11  class Matrix;
  12
  13 Index: src/cmd/collection.h
  14 ===================================================================
  15 --- src/cmd/collection.h        (revision 13191)
  16 +++ src/cmd/collection.h        (working copy)
  17 @@ -13,6 +13,7 @@
  18  #include "oldcollection.h"
  19  #elif defined (USE_STL_COLLECTION)
  20
  21 +#include <cstddef>
  22  #include <list>
  23  #include <vector>
  24
  25 Index: src/cmd/ai/fire.cpp
  26 ===================================================================
  27 --- src/cmd/ai/fire.cpp (revision 13191)
  28 +++ src/cmd/ai/fire.cpp (working copy)
  29 @@ -15,6 +15,9 @@
  30  #include "lin_time.h" //DEBUG ONLY
  31  #include "cmd/pilot.h"
  32
  33 +extern int numprocessed;
  34 +extern double targetpick;
  35 +
  36  static bool NoDockWithClear()
  37  {
  38      static bool nodockwithclear = XMLSupport::parse_bool( vs_config->getVariable( "physics", "dock_with_clear_planets", "true" ) );
  39 @@ -430,8 +433,6 @@
  40  {
  41      float gunspeed, gunrange, missilerange;
  42      parent->getAverageGunSpeed( gunspeed, gunrange, missilerange );
  43 -    extern int    numprocessed;
  44 -    extern double targetpick;
  45      static float  targettimer = UniverseUtil::GetGameTime();    //timer used to determine passage of physics frames
  46      static float  mintimetoswitch =
  47          XMLSupport::parse_float( vs_config->getVariable( "AI", "Targetting", "MinTimeToSwitchTargets", "3" ) );
  48 Index: src/cmd/ai/aggressive.cpp
  49 ===================================================================
  50 --- src/cmd/ai/aggressive.cpp   (revision 13191)
  51 +++ src/cmd/ai/aggressive.cpp   (working copy)
  52 @@ -27,6 +27,8 @@
  53  #include "faction_generic.h"
  54  #include "docking.h"
  55
  56 +extern double aggfire;
  57 +
  58  using namespace Orders;
  59
  60  const EnumMap::Pair element_names[] = {
  61 @@ -1608,7 +1610,6 @@
  62  {
  63      if (parent == uoi)
  64          printf( "kewl" );
  65 -    extern double aggfire;
  66      jump_time_check++;     //just so we get a nicely often wrapping var;
  67      jump_time_check %= 5;
  68      Flightgroup  *fg  = parent->getFlightgroup();