diff options
author | Edwin Groothuis <edwin@FreeBSD.org> | 2003-01-19 03:24:34 +0000 |
---|---|---|
committer | Edwin Groothuis <edwin@FreeBSD.org> | 2003-01-19 03:24:34 +0000 |
commit | 73bdb3698301dd166e89b1ff5905de201bb58804 (patch) | |
tree | bd0bc8da3dfd531843c0de15b490e7956c89b49c /games | |
parent | Fix make index (duplicate entry mailman-2.1), after temporary (diff) |
Make games/doomlegacy compiling on -current
Notes
Notes:
svn path=/head/; revision=73466
Diffstat (limited to 'games')
-rw-r--r-- | games/doomlegacy/files/patch-doomlegacy::linux_x::i_sound.c | 11 | ||||
-rw-r--r-- | games/doomlegacy/files/patch-doomlegacy::linux_x::linux.c | 11 | ||||
-rw-r--r-- | games/doomlegacy/files/patch-doomlegacy::t_prepro.h | 17 | ||||
-rw-r--r-- | games/doomlegacy/files/patch-i_tcp.c | 13 |
4 files changed, 52 insertions, 0 deletions
diff --git a/games/doomlegacy/files/patch-doomlegacy::linux_x::i_sound.c b/games/doomlegacy/files/patch-doomlegacy::linux_x::i_sound.c new file mode 100644 index 000000000000..edb4043f80cd --- /dev/null +++ b/games/doomlegacy/files/patch-doomlegacy::linux_x::i_sound.c @@ -0,0 +1,11 @@ +--- linux_x/i_sound.c.orig Sat Jan 18 18:24:12 2003 ++++ linux_x/i_sound.c Sat Jan 18 18:23:42 2003 +@@ -93,7 +93,7 @@ + // Linux voxware output. + #ifdef LINUX + #ifdef FREEBSD +-#include <machine/soundcard.h> ++#include <sys/soundcard.h> + #else + #include <linux/soundcard.h> + #endif diff --git a/games/doomlegacy/files/patch-doomlegacy::linux_x::linux.c b/games/doomlegacy/files/patch-doomlegacy::linux_x::linux.c new file mode 100644 index 000000000000..878733b2051f --- /dev/null +++ b/games/doomlegacy/files/patch-doomlegacy::linux_x::linux.c @@ -0,0 +1,11 @@ +--- linux_x/sndserv/linux.c.orig Sat Jan 18 18:29:07 2003 ++++ linux_x/sndserv/linux.c Sat Jan 18 18:29:12 2003 +@@ -45,7 +45,7 @@ + + #ifdef LINUX + #ifdef FREEBSD +-#include <machine/soundcard.h> ++#include <sys/soundcard.h> + #else + #include <linux/soundcard.h> + #endif diff --git a/games/doomlegacy/files/patch-doomlegacy::t_prepro.h b/games/doomlegacy/files/patch-doomlegacy::t_prepro.h new file mode 100644 index 000000000000..638135773148 --- /dev/null +++ b/games/doomlegacy/files/patch-doomlegacy::t_prepro.h @@ -0,0 +1,17 @@ +--- t_prepro.h.orig Wed May 16 15:33:34 2001 ++++ t_prepro.h Sat Jan 18 18:19:25 2003 +@@ -34,12 +34,12 @@ + #define __PREPRO_H__ + + #ifdef FREEBSD +-#include <machine/types.h> ++//#include <machine/types.h> + #endif + typedef struct section_s section_t; +-#ifndef FREEBSD ++#if __FreeBSD__ > 4 + typedef struct label_s label_t; + #endif + #define SECTIONSLOTS 17 + #define LABELSLOTS 17 + diff --git a/games/doomlegacy/files/patch-i_tcp.c b/games/doomlegacy/files/patch-i_tcp.c new file mode 100644 index 000000000000..e74d43c24892 --- /dev/null +++ b/games/doomlegacy/files/patch-i_tcp.c @@ -0,0 +1,13 @@ +--- i_tcp.c.orig Fri Jan 17 17:26:18 2003 ++++ i_tcp.c Fri Jan 17 17:27:09 2003 +@@ -219,6 +219,10 @@ + #include "doomstat.h" + #include "mserv.h" //Hurdler: support master server + ++// somewhere on the track between 4.5 and -current this one has disappered. ++#ifndef IPPORT_USERRESERVED ++ #define IPPORT_USERRESERVED 5000 ++#endif + #ifdef __WIN32__ + // some undifined under win32 + #define IPPORT_USERRESERVED 5000 |