pkgs/games/xpilot/server-gcc5.patch

   1 --- xpilot-1.4.6fxi/src/common/net.c    2016-02-09 00:20:43.531714342 +0000
   2 +++ xpilot-1.4.6fxi/src/common/net.c    2016-02-09 00:21:15.301331053 +0000
   3 @@ -608,9 +608,9 @@
   4  }
   5
   6  #if STDVA
   7 -inline int32_t Packet_scanf(sockbuf_t *sbuf, const char *fmt, ...)
   8 +extern int32_t Packet_scanf(sockbuf_t *sbuf, const char *fmt, ...)
   9  #else
  10 -inline int32_t Packet_scanf(va_alist)
  11 +extern int32_t Packet_scanf(va_alist)
  12  va_dcl
  13  #endif
  14  {
  15 --- xpilot-1.4.6fxi/src/server/collision.c      2016-02-09 00:22:29.581784405 +0000
  16 +++ xpilot-1.4.6fxi/src/server/collision.c      2016-02-09 00:22:38.152952500 +0000
  17 @@ -71,7 +71,7 @@
  18   * p: first object, q: second object
  19   */
  20
  21 -inline int32_t Collision_occured(int32_t p1x, int32_t p1y, int32_t p2x, int32_t p2y,
  22 +extern int32_t Collision_occured(int32_t p1x, int32_t p1y, int32_t p2x, int32_t p2y,
  23                 int32_t q1x, int32_t q1y, int32_t q2x, int32_t q2y, int32_t r)
  24  {
  25         int32_t fac1, fac2;     /* contraction between the distance between the x and y coordinates of objects */
  26 --- xpilot-1.4.6fxi/src/server/player.c 2016-02-09 00:25:29.546313808 +0000
  27 +++ xpilot-1.4.6fxi/src/server/player.c 2016-02-09 00:25:40.464527932 +0000
  28 @@ -1411,12 +1411,12 @@
  29         return NULL;
  30  }
  31
  32 -inline bool Player_idle_timed_out(player_t *pl)
  33 +extern bool Player_idle_timed_out(player_t *pl)
  34  {
  35         return (frame_loops - pl->frame_last_busy > MAX_PLAYER_IDLE_TICKS && (NumPlayers > 1)) ? true : false;
  36  }
  37
  38 -inline bool Player_is_recovered(player_t *pl)
  39 +extern bool Player_is_recovered(player_t *pl)
  40  {
  41         return (pl->recovery_count <= 0.0) ? true : false;
  42  }
  43 --- xpilot-1.4.6fxi/src/server/score.c  2016-02-09 00:21:45.659923025 +0000
  44 +++ xpilot-1.4.6fxi/src/server/score.c  2016-02-09 00:22:07.224345939 +0000
  45 @@ -24,17 +24,17 @@
  46  char msg[MSG_LEN];
  47
  48
  49 -inline double Get_Score(player_t *pl)
  50 +extern double Get_Score(player_t *pl)
  51  {
  52      return pl->score;
  53  }
  54
  55 -inline void Score_set(player_t * pl, double score)
  56 +extern void Score_set(player_t * pl, double score)
  57  {
  58      pl->score = score;
  59  }
  60
  61 -inline void Score_add(player_t * pl, double score)
  62 +extern void Score_add(player_t * pl, double score)
  63  {
  64      pl->score += score;
  65  }