--- a/make/autoconf/flags-cflags.m4	Mon Mar 05 23:20:54 2018 +0100
+++ b/make/autoconf/flags-cflags.m4	Mon Mar 05 23:23:50 2018 +0100
@@ -184,7 +184,7 @@
     microsoft)
       DISABLE_WARNING_PREFIX="-wd"
       CFLAGS_WARNINGS_ARE_ERRORS="-WX"
-      
+
       WARNINGS_ENABLE_ALL="-Wall"
       EVEN_MORE="4054 4055 4057 4100 4127 4131 4132 4152 4201 4204 4206 4210 4232 4244 4255 4263 4264 4295 4302 4306 4311 4324 4366 4388 4512 4548 4555 4574 4800 4986 4987"
       DISABLED_WARNINGS="4061 4062 4130 4189 4191 4211 4242 4245 4265 4287 4296 4310 4312 4350 4355 4365 4389 4505 4510 4514 4571 4610 4619 4623 4625 4626 4640 4668 4701 4702 4703 4706 4710 4711 4820 4917 4946 $EVEN_MORE"
@@ -197,7 +197,7 @@
       WARNINGS_ENABLE_ALL_CFLAGS="-v -fd -xtransition"
       WARNINGS_ENABLE_ALL_CXXFLAGS="+w +w2"
 
-      DISABLED_WARNINGS_C="E_OLD_STYLE_FUNC_DECL E_OLD_STYLE_FUNC_DEF E_SEMANTICS_OF_OP_CHG_IN_ANSI_C E_NO_REPLACEMENT_IN_STRING"
+      DISABLED_WARNINGS_C="E_OLD_STYLE_FUNC_DECL E_OLD_STYLE_FUNC_DEF E_SEMANTICS_OF_OP_CHG_IN_ANSI_C E_NO_REPLACEMENT_IN_STRING E_DECLARATION_IN_CODE"
       DISABLED_WARNINGS_CXX="inllargeuse inllargeint notused wemptydecl notemsource"
       # helpful quality checks, should not be disabled: inllargeuse inllargeint
       ;;

--- a/make/lib/Awt2dLibraries.gmk	Mon Mar 05 23:20:54 2018 +0100
+++ b/make/lib/Awt2dLibraries.gmk	Mon Mar 05 23:23:50 2018 +0100
@@ -237,7 +237,6 @@
     DISABLED_WARNINGS_gcc := sign-compare unused-result maybe-uninitialized \
         format-nonliteral parentheses, \
     DISABLED_WARNINGS_clang := logical-op-parentheses extern-initializer, \
-    DISABLED_WARNINGS_solstudio := E_DECLARATION_IN_CODE, \
     DISABLED_WARNINGS_microsoft := 4297 4244 4267 4996, \
     ASFLAGS := $(LIBAWT_ASFLAGS), \
     MAPFILE := $(LIBAWT_MAPFILE), \
@@ -360,7 +359,7 @@
             unused-result maybe-uninitialized format \
             format-security int-to-pointer-cast parentheses \
             implicit-fallthrough, \
-        DISABLED_WARNINGS_solstudio := E_DECLARATION_IN_CODE \
+        DISABLED_WARNINGS_solstudio := \
             E_ASSIGNMENT_TYPE_MISMATCH E_NON_CONST_INIT, \
         MAPFILE := $(TOPDIR)/make/mapfiles/libawt_xawt/mapfile-vers, \
         LDFLAGS := $(LDFLAGS_JDKLIB) \
@@ -947,7 +946,7 @@
       DISABLED_WARNINGS_gcc := sign-compare type-limits unused-result \
           maybe-uninitialized shift-negative-value implicit-fallthrough, \
       DISABLED_WARNINGS_clang := incompatible-pointer-types, \
-      DISABLED_WARNINGS_solstudio := E_NEWLINE_NOT_LAST E_DECLARATION_IN_CODE \
+      DISABLED_WARNINGS_solstudio := E_NEWLINE_NOT_LAST \
           E_STATEMENT_NOT_REACHED, \
       DISABLED_WARNINGS_microsoft := 4018 4244 4267, \
       MAPFILE := $(TOPDIR)/make/mapfiles/libsplashscreen/mapfile-vers, \