Unverified Commit 00306dc0 authored by 7c6f434c's avatar 7c6f434c Committed by GitHub
Browse files

xpilot-ng: fix build with gcc15 (#476629)

parents 6e82bd53 ac4a28ad

pkgs/by-name/xp/xpilot-ng/package.nix

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ stdenv.mkDerivation (finalAttrs: { 
  patches = [

    ./xpilot-ng-gcc-14-fix.patch

    ./xpilot-ng-sdl-window-fix.patch

    ./xpilot-ng-gcc-15-fix.patch

  ];



  meta = {

pkgs/by-name/xp/xpilot-ng/xpilot-ng-gcc-15-fix.patch

0 → 100644
+13 −0
Original line number Diff line number Diff line 
Only in xpilot-ng-4.7.3/src/server: .suibotdef.c.swp

diff -r -U3 xpilot-ng-4.7.3.orig/src/server/suibotdef.c xpilot-ng-4.7.3/src/server/suibotdef.c

--- xpilot-ng-4.7.3.orig/src/server/suibotdef.c	2026-01-03 16:26:37.070168944 +0100

+++ xpilot-ng-4.7.3/src/server/suibotdef.c	2026-01-03 16:27:31.970201518 +0100

@@ -372,7 +372,7 @@

 } object_proximity_t;

 

 

-static bool Get_object_proximity();

+static bool Get_object_proximity(player_t *pl, object_t *shot, double sqmaxdist,int maxtime, object_proximity_t *object_proximity);

 static bool Get_object_proximity(player_t *pl, object_t *shot, double sqmaxdist,int maxtime, object_proximity_t *object_proximity){

    /* get square of closest distance between player and object

     * compare with sqmaxdist and maxtime and return sqdistance and time