diff options
Diffstat (limited to 'games/plib/patches/patch-aa')
| -rw-r--r-- | games/plib/patches/patch-aa | 33 |
1 files changed, 26 insertions, 7 deletions
diff --git a/games/plib/patches/patch-aa b/games/plib/patches/patch-aa index d1aa9f79cd8..28ee6c921c4 100644 --- a/games/plib/patches/patch-aa +++ b/games/plib/patches/patch-aa @@ -1,16 +1,35 @@ -$NetBSD: patch-aa,v 1.3 2003/09/22 12:27:29 xtraeme Exp $ +$NetBSD: patch-aa,v 1.4 2006/03/28 23:05:05 joerg Exp $ --- src/sl/slPortability.h.orig Mon Sep 22 06:08:29 2003 +++ src/sl/slPortability.h Mon Sep 22 06:09:02 2003 -@@ -78,7 +78,11 @@ +@@ -35,7 +35,8 @@ + + /* the next lines are to define BSD */ + /* see http://www.freebsd.org/handbook/porting.html for why we do this */ +-#if (defined(__unix__) || defined(unix)) && !defined(USG) ++#if (defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)) \ ++ && !defined(USG) + #include <sys/param.h> + #endif + +@@ -70,15 +71,17 @@ + #include <limits.h> + #include <math.h> + +-#if (defined(__linux__) || defined(BSD)) && !defined(__NetBSD__) ++#if (defined(__linux__) || defined(BSD) || defined(__DragonFly__)) && !defined(__NetBSD__) + #define SL_USING_OSS_AUDIO 1 + #endif + + #ifdef SL_USING_OSS_AUDIO # if defined(__linux__) # include <linux/soundcard.h> - # elif defined(__FreeBSD__) -+# if __FreeBSD_version >= 500000 +-# elif defined(__FreeBSD__) +-# include <machine/soundcard.h> ++# elif (defined(__FreeBSD__) && __FreeBSD_version >= 500000) || defined(__DragonFly__) +# include <sys/soundcard.h> -+# else - # include <machine/soundcard.h> -+# endif ++# elif (defined(__FreeBSD__) && __FreeBSD_version < 500000) ++# include <machine/soundcard.h> # else /* Tom thinks this file may be <sys/soundcard.h> under some |