[oss-devel] [PATCH] fix compile on FreeBSD 9-CURRENT

[Yair K.]

Hi,

  The attached patch (made by the FreeBSD port) fixes compile on FreeBSD 9-
CURRENT. Also attached a small misc diff.

Yours,
        Yair K.


diff -r b22444a65d59 cmd/osspartysh/osspartysh.c
--- a/cmd/osspartysh/osspartysh.c	Sat Jan 30 03:49:51 2010 +0200
+++ b/cmd/osspartysh/osspartysh.c	Sun Jan 31 15:47:32 2010 +0200
@@ -36,8 +36,8 @@
 #include <libutil.h>
 #else
 #include <pty.h>
+#include <utmp.h>
 #endif
-#include <utmp.h>
 #include <errno.h>
 
 #define PARTYSH_MAGIC		"ParTySH"
diff -r b22444a65d59 kernel/OS/FreeBSD/os_freebsd.c
--- a/kernel/OS/FreeBSD/os_freebsd.c	Sat Jan 30 03:49:51 2010 +0200
+++ b/kernel/OS/FreeBSD/os_freebsd.c	Sun Jan 31 15:47:32 2010 +0200
@@ -893,9 +893,15 @@
   return ev.revents;
 }
 
+#if defined(D_VERSION_03) && (D_VERSION == D_VERSION_03)
+static int
+oss_mmap (struct cdev *bsd_dev, vm_ooffset_t offset, vm_paddr_t * paddr,
+	  int nprot, vm_memattr_t *memattr)
+#else
 static int
 oss_mmap (struct cdev *bsd_dev, vm_offset_t offset, vm_paddr_t * paddr,
 	  int nprot)
+#endif
 {
   int retval;
   int dev;

diff -r b22444a65d59 cmd/ossplay/ossplay.c
--- a/cmd/ossplay/ossplay.c	Sat Jan 30 03:49:51 2010 +0200
+++ b/cmd/ossplay/ossplay.c	Sun Jan 31 15:47:32 2010 +0200
@@ -629,7 +629,7 @@
 	         tmp, speed);
     }
 
-  dsp->speed = speed;
+  dsp->speed = tmp;
   dsp->channels = channels;
   dsp->format = format;
 
diff -r b22444a65d59 setup/srcconf.c
--- a/setup/srcconf.c	Sat Jan 30 03:49:51 2010 +0200
+++ b/setup/srcconf.c	Sun Jan 31 15:47:32 2010 +0200
@@ -1311,7 +1311,7 @@
 	      grc_max = q;
 	}
 
-	if (grc_max > grc_min)
+	if (grc_max < grc_min)
 	   grc_max = grc_min = 3;
 
 	fprintf (f, "#define CONFIG_OSS_GRC_MIN_QUALITY %d\n", grc_min);

_______________________________________________
oss-devel mailing list
oss-devel@mailman.opensound.com
http://mailman.opensound.com/mailman/listinfo/oss-devel