. Use <sys/soundcard.h> on FreeBSD (fixes compilation on 5.x).

. Cope with gcc 3.x in a preprocessor conditional.

PR:		47707, 47699
Submitted by:	grog (PRs),
		"R. Lake" <rich@lakes.plus.com> (independently in email)
This commit is contained in:
Greg Lewis 2003-02-20 10:04:20 +00:00
parent 842c89048e
commit 7444b52f8d
2 changed files with 32 additions and 0 deletions

View file

@ -0,0 +1,16 @@
Index: src/bsd/native/sun/audio/HAE_API_bsd.c
===================================================================
RCS file: /home/Java/CVS/JDK2/javasrc/src/bsd/native/sun/audio/HAE_API_bsd.c,v
retrieving revision 1.7
diff -u -r1.7 HAE_API_bsd.c
--- src/bsd/native/sun/audio/HAE_API_bsd.c 11 Sep 2001 05:01:58 -0000 1.7
+++ src/bsd/native/sun/audio/HAE_API_bsd.c 20 Feb 2003 07:10:48 -0000
@@ -51,7 +51,7 @@
#include <sys/wait.h>
#include <errno.h>
#ifdef __FreeBSD__
-#include <machine/soundcard.h>
+#include <sys/soundcard.h>
#elif __OpenBSD__
#include <soundcard.h>
#endif

View file

@ -0,0 +1,16 @@
Index: src/share/tools/hprof/hprof_method.c
===================================================================
RCS file: /home/Java/CVS/JDK2/javasrc/src/share/tools/hprof/hprof_method.c,v
retrieving revision 1.3
diff -u -r1.3 hprof_method.c
--- src/share/tools/hprof/hprof_method.c 26 Oct 1999 20:42:59 -0000 1.3
+++ src/share/tools/hprof/hprof_method.c 20 Feb 2003 07:11:17 -0000
@@ -123,7 +123,7 @@
int stack_depth;
int trace_depth;
unsigned int hash = 0;
-#if defined __GNUC__ && (__GNUC__ == 2 && __GNUC_MINOR__ >= 8)
+#if defined(__GNUC__) && ((__GNUC__ == 2 && __GNUC_MINOR__ >= 8) || (__GNUC__ >= 3))
jlong total_time = 0;
#endif
int i;