summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--native/jni/midi-dssi/Makefile.am5
2 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c4f094db1..11be0cc74 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-11-26 Dalibor Topic <robilad@kaffe.org>
+
+ Fixes bug #26756.
+
+ * native/jni/midi-dssi/Makefile.am (AM_CFLAGS): Removed
+ STRICT_WARNING_CFLAGS since it caused the build to fail
+ on GNU/Linux.
+
2006-11-26 Ian Rogers <ian.rogers@manchester.ac.uk>
* doc/vmintegration.texinfo: Update VM Threading Model section.
diff --git a/native/jni/midi-dssi/Makefile.am b/native/jni/midi-dssi/Makefile.am
index 48c8051cc..692579d46 100644
--- a/native/jni/midi-dssi/Makefile.am
+++ b/native/jni/midi-dssi/Makefile.am
@@ -9,4 +9,7 @@ libgjsmdssi_la_LDFLAGS = -avoid-version
AM_LDFLAGS = @CLASSPATH_MODULE@
AM_CPPFLAGS = @CLASSPATH_INCLUDES@
-AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @ERROR_CFLAGS@
+# No STRICT_WARNING_CFLAGS here as we use dlsym to load the address of
+# a function,and ISO C prohibits casting void pointers, like those returned
+# by dlsym, to function pointers.
+AM_CFLAGS = @WARNING_CFLAGS@ @ERROR_CFLAGS@