Make it compile on FreeBSD.

This was easier than expected. Only two items needed fixing:

- signal.h has to be included for several files that use signals.
- The __used and __packed macros are already defined on FreeBSD which
  leads to an error at compile time. Fortunately paraslash doesn't use
  these macros at all, so we can simply remove them.

diff --git a/FEATURES b/FEATURES
index 30e778ba601a6ad885ccc3b126f236e5cfd25f62..57fdb38656a460fc9b7b6a6c7f6e185c9f566dd6 100644 (file)
--- a/FEATURES
+++ b/FEATURES
@@ -3,7 +3,7 @@ Features
 
 ------------------------------------------------------------------------------
 
-       * Linux and Mac OS support
+       * Runs on Linux, Mac OS, FreeBSD and probably other Unixes.
        * mp3, oggvorbis, aac(m4a) support
        * local or remote http, dccp, and ortp network audio streaming
        * volume normalizer

diff --git a/afs.c b/afs.c
index f40e02244313054ca08f2066e8bb12b488de2579..b7d27927c3aa491866d1ed89b4ae347d067f6173 100644 (file)
--- a/afs.c
+++ b/afs.c
@@ -6,6 +6,7 @@
 
 /** \file afs.c Paraslash's audio file selector. */
 
+#include <signal.h>
 #include <fnmatch.h>
 #include "server.cmdline.h"
 #include "para.h"

diff --git a/command.c b/command.c
index 072b972cb5754122aa539178edbf6cf43a19d3e3..e33bae61133d04eaaba48fc71cf358d4b14cbe5b 100644 (file)
--- a/command.c
+++ b/command.c
@@ -6,6 +6,7 @@
 
 /** \file command.c does client authentication and executes server commands */
 
+#include <signal.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <dirent.h>

diff --git a/gcc-compat.h b/gcc-compat.h
index 5fea55d5cec035b1e504f0ac928e1f9cdcd463ff..c4e43107def98935f6ef1000a20128274a037b8e 100644 (file)
--- a/gcc-compat.h
+++ b/gcc-compat.h
@@ -1,9 +1,7 @@
 # define inline                inline __attribute__ ((always_inline))
 # define __noreturn    __attribute__ ((noreturn))
 # define __malloc      __attribute__ ((malloc))
-# define __used                __attribute__ ((used))
 # define __a_unused    __attribute__ ((unused))
-# define __packed      __attribute__ ((packed))
 # define likely(x)     __builtin_expect (!!(x), 1)
 # define unlikely(x)   __builtin_expect (!!(x), 0)
 /* 

diff --git a/gui.c b/gui.c
index d8e200342fc991380445b6fa120ac2d2560bb05e..f884e8643140fcb0145bb0a7a193a36618e96b9e 100644 (file)
--- a/gui.c
+++ b/gui.c
@@ -6,9 +6,9 @@
 
 /** \file gui.c ncurses-based interface for paraslash */
 
+#include <signal.h>
 #include <sys/types.h>
 #include <dirent.h>
-
 #include "gui.cmdline.h"
 #include "para.h"
 #include "gui.h"

diff --git a/playlist_selector.c b/playlist_selector.c
index 6866dafb56b98f437897feab2a7856512656af9b..6a74a922b65f1a026fa46df52f733732b31b100a 100644 (file)
--- a/playlist_selector.c
+++ b/playlist_selector.c
@@ -6,6 +6,7 @@
 
 /** \file playlist_selector.c The playlist audio file selector of paraslash  */
 
+#include <signal.h>
 #include "para.h"
 #include "afh.h"
 #include "server.h"

diff --git a/server.c b/server.c
index d98e9603ced15a27ea1780ffb7ef850e5138c55e..334787241e3952b2462485fee68c7882f313e967 100644 (file)
--- a/server.c
+++ b/server.c
@@ -15,6 +15,7 @@
  *
  */
 
+#include <signal.h>
 #include <sys/types.h>
 #include <dirent.h>