From 68dfdda7404d2a86c83312ec3dee41efef226375 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Fri, 1 Sep 2023 22:56:05 +0200
Subject: [PATCH] fix Linux compilation

---
 s/build      | 6 +-----
 src/battle.c | 9 ++-------
 src/battle.h | 1 +
 src/tests.c  | 1 -
 4 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/s/build b/s/build
index f47ff2d95..3e0a52ffe 100755
--- a/s/build
+++ b/s/build
@@ -2,11 +2,7 @@
 ROOT=$(git rev-parse --show-toplevel)
 BUILD=build
 if [ -z "$JOBS" ] ; then
-  if [ -e /usr/sbin/sysctl ]; then
-    JOBS=`sysctl -n hw.ncpu`
-  else
-    JOBS=`nproc`
-  fi
+  JOBS=`nproc`
 fi
 DISTCC=`which distcc`
 if [ ! -z "$DISTCC" ] ; then
diff --git a/src/battle.c b/src/battle.c
index cb7e8b90a..8a039ab4b 100644
--- a/src/battle.c
+++ b/src/battle.c
@@ -3018,11 +3018,6 @@ static void print_stats(battle * b)
     }
 }
 
-static int weapon_weight(const weapon * w)
-{
-    return w->attackskill + w->defenseskill;
-}
-
 side * get_side(battle * b, const struct unit * u)
 {
     side * s;
@@ -3092,8 +3087,8 @@ static void equip_weapons(fighter* fig)
     item* itm;
     unit* u = fig->unit;
     int wpless = weapon_skill(NULL, u, true);
-    size_t w;
-    int p_melee = 0, p_missile = 0, i;
+    size_t w, i;
+    int p_melee = 0, p_missile = 0;
 
     fig->weapons = NULL;
     for (itm = u->items; itm; itm = itm->next) {
diff --git a/src/battle.h b/src/battle.h
index 9392c6529..84ff3694b 100644
--- a/src/battle.h
+++ b/src/battle.h
@@ -6,6 +6,7 @@
 
 struct message;
 struct selist;
+struct weapon_type;
 union variant;
 
 /** more defines **/
diff --git a/src/tests.c b/src/tests.c
index 23125b1cb..1ddd80519 100644
--- a/src/tests.c
+++ b/src/tests.c
@@ -48,7 +48,6 @@
 
 #include <assert.h>
 #include <errno.h>
-#include <stdarg.h>
 #include <stdbool.h>           // for true
 #include <stdio.h>             // for fprintf, stderr
 #include <stdlib.h>