Fix build on -current (machine/soundcard.h -> sys/soundcard.h)

This commit is contained in:
Kris Kennaway 2002-09-08 10:39:12 +00:00
parent 3b71e09158
commit b2a7ffa557
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=65835
2 changed files with 14 additions and 8 deletions

View file

@ -1,12 +1,16 @@
--- xtuner.h.orig Thu Dec 19 14:33:57 1996 --- xtuner.h.orig Thu Dec 19 11:33:57 1996
+++ xtuner.h Thu Jul 4 05:52:14 2002 +++ xtuner.h Sun Sep 8 03:33:58 2002
@@ -9,15 +9,14 @@ @@ -9,15 +9,18 @@
#if (defined(BSD) && (BSD >= 199306)) #if (defined(BSD) && (BSD >= 199306))
# include <osreldate.h> # include <osreldate.h>
# include <stdlib.h> # include <stdlib.h>
-# include "/usr/X11/include/X11/forms.h" -# include "/usr/X11/include/X11/forms.h"
# include <machine/cpufunc.h> # include <machine/cpufunc.h>
+#ifdef __FreeBSD__
+# include <sys/soundcard.h>
+#else
# include <machine/soundcard.h> # include <machine/soundcard.h>
+#endif
#else #else
# include <asm/io.h> # include <asm/io.h>
-# include "forms.h" -# include "forms.h"
@ -17,7 +21,7 @@
#include <X11/xpm.h> #include <X11/xpm.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>
@@ -46,6 +45,13 @@ @@ -46,6 +49,13 @@
#if (defined(BSD) && (BSD >= 199306)) #if (defined(BSD) && (BSD >= 199306))
int fpiopl; int fpiopl;

View file

@ -1,14 +1,16 @@
--- src/audio.c.orig Mon Nov 9 08:22:55 1998 --- src/audio.c.orig Sun Nov 8 15:22:55 1998
+++ src/audio.c Fri Jun 30 19:49:15 2000 +++ src/audio.c Sun Sep 8 03:35:52 2002
@@ -37,7 +37,7 @@ @@ -37,8 +37,8 @@
#ifdef linux #ifdef linux
#include <linux/soundcard.h> #include <linux/soundcard.h>
-#elif defined(FreeBSD) -#elif defined(FreeBSD)
-#include <machine/soundcard.h>
+#elif defined(__FreeBSD__) +#elif defined(__FreeBSD__)
#include <machine/soundcard.h> +#include <sys/soundcard.h>
#elif defined(sgi) #elif defined(sgi)
#include <dmedia/audio.h>
@@ -55,7 +55,7 @@ @@ -55,7 +55,7 @@
#include "sample_settings.h" #include "sample_settings.h"
#include "audio.h" #include "audio.h"