changeset 32110:733062f75808

8074831: Resolve disabled warnings for libjsound Reviewed-by: amenkov, azvegint
author serb
date Sat, 18 Jul 2015 15:12:08 +0300
parents b89c59200379
children 77f01a77573d
files jdk/make/lib/SoundLibraries.gmk jdk/src/java.desktop/share/native/libjsound/PortMixer.c jdk/src/java.desktop/share/native/libjsound/Ports.h
diffstat 3 files changed, 2 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/jdk/make/lib/SoundLibraries.gmk	Sat Jul 18 15:09:28 2015 +0300
+++ b/jdk/make/lib/SoundLibraries.gmk	Sat Jul 18 15:12:08 2015 +0300
@@ -123,9 +123,6 @@
     CFLAGS := $(CFLAGS_JDKLIB) \
         $(LIBJSOUND_CFLAGS), \
     CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBJSOUND_CFLAGS), \
-    DISABLED_WARNINGS_clang := implicit-function-declaration \
-        deprecated-writable-strings, \
-    WARNINGS_AS_ERRORS_clang := false, \
     MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjsound/mapfile-vers, \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
--- a/jdk/src/java.desktop/share/native/libjsound/PortMixer.c	Sat Jul 18 15:09:28 2015 +0300
+++ b/jdk/src/java.desktop/share/native/libjsound/PortMixer.c	Sat Jul 18 15:12:08 2015 +0300
@@ -272,7 +272,7 @@
 }
 
 void* PORT_NewFloatControl(void* creatorV, void* controlID, char* type,
-                           float min, float max, float precision, char* units) {
+                           float min, float max, float precision, const char* units) {
     ControlCreatorJNI* creator = (ControlCreatorJNI*) creatorV;
     jobject ctrl = NULL;
     jstring unitsString;
--- a/jdk/src/java.desktop/share/native/libjsound/Ports.h	Sat Jul 18 15:09:28 2015 +0300
+++ b/jdk/src/java.desktop/share/native/libjsound/Ports.h	Sat Jul 18 15:12:08 2015 +0300
@@ -93,7 +93,7 @@
  * returns an opaque pointer to the created control
  */
 typedef void* (*PORT_NewFloatControlPtr)(void* creator, void* controlID, char* type,
-              float min, float max, float precision, char* units);
+              float min, float max, float precision, const char* units);
 
 /* control: The control to add to current port
  * creator: pointer to the creator struct provided by PORT_GetControls