1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
|
--- plib-1.8.4.orig/src/js/jsLinuxOld.cxx
+++ plib-1.8.4/src/js/jsLinuxOld.cxx
@@ -27,7 +27,7 @@
#include <linux/joystick.h>
-#if !defined(JS_VERSION) || JS_VERSION >= 0x010000
+#if !defined(JS_VERSION) || JS_VERSION < 0x010000
#include <fcntl.h>
#include <sys/ioctl.h>
--- plib-1.8.4.orig/src/js/jsBSD.cxx
+++ plib-1.8.4/src/js/jsBSD.cxx
@@ -45,7 +45,7 @@
#endif
#include <sys/ioctl.h>
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
# include <sys/joystick.h>
#else
# include <machine/joystick.h> // For analog joysticks
--- plib-1.8.4.orig/src/sl/slDSP.cxx
+++ plib-1.8.4/src/sl/slDSP.cxx
@@ -413,7 +413,7 @@
/* NetBSD/OpenBSD 2.3 this should be very close to SUN Audio */
/* ------------------------------------------------------------ */
-#elif (defined(UL_BSD) && !defined(__FreeBSD__)) || defined(UL_SOLARIS)
+#elif (defined(UL_BSD) && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__)) || defined(UL_SOLARIS)
void slDSP::open ( const char *device, int _rate, int _stereo, int _bps )
{
--- plib-1.8.4.orig/src/sl/slPortability.h
+++ plib-1.8.4/src/sl/slPortability.h
@@ -59,8 +59,8 @@
# if defined(UL_LINUX)
# include <linux/soundcard.h>
# include <sys/ioctl.h>
-# elif defined(__FreeBSD__)
-# include <machine/soundcard.h>
+# elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+# include <sys/soundcard.h>
# else
/*
Tom thinks this file may be <sys/soundcard.h> under some
@@ -75,7 +75,7 @@
#endif
#ifdef UL_BSD
-#ifndef __FreeBSD__
+#if !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__)
# include <sys/audioio.h>
#endif
#endif
--- plib-1.8.4.orig/src/ssgAux/ssgaSky.h
+++ plib-1.8.4/src/ssgAux/ssgaSky.h
@@ -104,7 +104,7 @@
ssgaCelestialBodyList ( int init = 3 )
: ssgSimpleList ( sizeof(ssgaCelestialBody*), init ) { }
- ssgaCelestialBodyList::~ssgaCelestialBodyList () { removeAll(); }
+ ~ssgaCelestialBodyList () { removeAll(); }
int getNum (void) { return total ; }
@@ -192,7 +192,7 @@
ssgaCloudLayerList ( int init = 3 )
: ssgSimpleList ( sizeof(ssgaCloudLayer*), init ) { }
- ssgaCloudLayerList::~ssgaCloudLayerList () { removeAll(); }
+ ~ssgaCloudLayerList () { removeAll(); }
int getNum (void) { return total ; }
|
