From c653468fc0091a9d77c112cf0a7c4b649c3129a5 Mon Sep 17 00:00:00 2001
From: glewis <glewis@FreeBSD.org>
Date: Tue, 16 Apr 2002 19:34:24 +0000
Subject: Fix the build of libaudio.so on 5-CURRENT by using <sys/soundcard.h>
 rather than <machine/soundcard.h>.  This doesn't affect the build on
 4-STABLE.

PR:		36988
Submitted by:	Motoyuki Konno <motoyuki@bsdclub.org>
Reviewed by:	sobomax
Approved by:	sobomax
---
 ...tive::com::sun::media::sound::engine::HAE_API_BSDOS.c | 16 ++++++++++++++++
 ...m::sun::media::sound::engine::HAE_API_BSDOS_Capture.c | 16 ++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 java/jdk14/files/patch-..::src::solaris::native::com::sun::media::sound::engine::HAE_API_BSDOS.c
 create mode 100644 java/jdk14/files/patch-..::src::solaris::native::com::sun::media::sound::engine::HAE_API_BSDOS_Capture.c

(limited to 'java/jdk14/files')

diff --git a/java/jdk14/files/patch-..::src::solaris::native::com::sun::media::sound::engine::HAE_API_BSDOS.c b/java/jdk14/files/patch-..::src::solaris::native::com::sun::media::sound::engine::HAE_API_BSDOS.c
new file mode 100644
index 000000000000..5adab099618b
--- /dev/null
+++ b/java/jdk14/files/patch-..::src::solaris::native::com::sun::media::sound::engine::HAE_API_BSDOS.c
@@ -0,0 +1,16 @@
+$FreeBSD$
+
+--- ../src/solaris/native/com/sun/media/sound/engine/HAE_API_BSDOS.c	Thu Apr 11 14:58:48 2002
++++ ../src/solaris/native/com/sun/media/sound/engine/HAE_API_BSDOS.c	Thu Apr 11 15:14:18 2002
+@@ -58,7 +58,11 @@
+ #include <sys/wait.h>
+ #include <errno.h>
+ #ifdef __FreeBSD__
++#if __FreeBSD__ > 3
++#include <sys/soundcard.h>
++#else
+ #include <machine/soundcard.h>
++#endif
+ #endif
+ #ifdef __NetBSD__
+ #include <soundcard.h>
diff --git a/java/jdk14/files/patch-..::src::solaris::native::com::sun::media::sound::engine::HAE_API_BSDOS_Capture.c b/java/jdk14/files/patch-..::src::solaris::native::com::sun::media::sound::engine::HAE_API_BSDOS_Capture.c
new file mode 100644
index 000000000000..2a97feca640e
--- /dev/null
+++ b/java/jdk14/files/patch-..::src::solaris::native::com::sun::media::sound::engine::HAE_API_BSDOS_Capture.c
@@ -0,0 +1,16 @@
+$FreeBSD$
+
+--- ../src/solaris/native/com/sun/media/sound/engine/HAE_API_BSDOS_Capture.c	Thu Apr 11 14:58:48 2002
++++ ../src/solaris/native/com/sun/media/sound/engine/HAE_API_BSDOS_Capture.c	Thu Apr 11 15:15:16 2002
+@@ -45,7 +45,11 @@
+ #include <sys/wait.h>
+ #include <errno.h>
+ #ifdef __FreeBSD__
++#if __FreeBSD__ > 3
++#include <sys/soundcard.h>
++#else
+ #include <machine/soundcard.h>
++#endif
+ #endif
+ #ifdef __NetBSD__
+ #include <soundcard.h>
-- 
cgit