diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2003-02-20 10:04:20 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2003-02-20 10:04:20 +0000 |
| commit | 7444b52f8d0dd55b22ddd6dcbc7a545c68144e42 (patch) | |
| tree | de483b5e2a0a05e14baaac8eaf5de42905c24c3f /java/jdk12 | |
| parent | Don't even try to sense Berkeley DB2/DB3 (from /usr/local), it (diff) | |
. 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)
Notes
Notes:
svn path=/head/; revision=75933
Diffstat (limited to 'java/jdk12')
| -rw-r--r-- | java/jdk12/files/patch-HAE_API_bsd.c | 16 | ||||
| -rw-r--r-- | java/jdk12/files/patch-hprof_method.c | 16 |
2 files changed, 32 insertions, 0 deletions
diff --git a/java/jdk12/files/patch-HAE_API_bsd.c b/java/jdk12/files/patch-HAE_API_bsd.c new file mode 100644 index 000000000000..ac99bc417af5 --- /dev/null +++ b/java/jdk12/files/patch-HAE_API_bsd.c @@ -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 diff --git a/java/jdk12/files/patch-hprof_method.c b/java/jdk12/files/patch-hprof_method.c new file mode 100644 index 000000000000..99da9b5a31f5 --- /dev/null +++ b/java/jdk12/files/patch-hprof_method.c @@ -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; |