--- old/src/java.desktop/share/native/libjsound/Utilities.h	2018-03-15 02:00:52.534586470 +0100
+++ /dev/null	2018-02-16 14:25:25.622524048 +0100
@@ -1,85 +0,0 @@
-/*
- * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-#include <jni.h>
-#include "jni_util.h"
-#include "SoundDefs.h"
-#include "Configure.h"          // put flags for debug msgs etc. here
-
-// return 1 if this platform is big endian, or 0 for little endian
-int UTIL_IsBigEndianPlatform();
-
-
-// ERROR PRINTS
-#ifdef USE_ERROR
-#define ERROR0(string)                        { fprintf(stdout, (string)); fflush(stdout); }
-#define ERROR1(string, p1)                    { fprintf(stdout, (string), (p1)); fflush(stdout); }
-#define ERROR2(string, p1, p2)                { fprintf(stdout, (string), (p1), (p2)); fflush(stdout); }
-#define ERROR3(string, p1, p2, p3)            { fprintf(stdout, (string), (p1), (p2), (p3)); fflush(stdout); }
-#define ERROR4(string, p1, p2, p3, p4)        { fprintf(stdout, (string), (p1), (p2), (p3), (p4)); fflush(stdout); }
-#else
-#define ERROR0(string)
-#define ERROR1(string, p1)
-#define ERROR2(string, p1, p2)
-#define ERROR3(string, p1, p2, p3)
-#define ERROR4(string, p1, p2, p3, p4)
-#endif
-
-
-// TRACE PRINTS
-#ifdef USE_TRACE
-#define TRACE0(string)                        { fprintf(stdout, (string)); fflush(stdout); }
-#define TRACE1(string, p1)                    { fprintf(stdout, (string), (p1)); fflush(stdout); }
-#define TRACE2(string, p1, p2)                { fprintf(stdout, (string), (p1), (p2)); fflush(stdout); }
-#define TRACE3(string, p1, p2, p3)            { fprintf(stdout, (string), (p1), (p2), (p3)); fflush(stdout); }
-#define TRACE4(string, p1, p2, p3, p4)        { fprintf(stdout, (string), (p1), (p2), (p3), (p4)); fflush(stdout); }
-#define TRACE5(string, p1, p2, p3, p4, p5)    { fprintf(stdout, (string), (p1), (p2), (p3), (p4), (p5)); fflush(stdout); }
-#else
-#define TRACE0(string)
-#define TRACE1(string, p1)
-#define TRACE2(string, p1, p2)
-#define TRACE3(string, p1, p2, p3)
-#define TRACE4(string, p1, p2, p3, p4)
-#define TRACE5(string, p1, p2, p3, p4, p5)
-#endif
-
-
-// VERBOSE TRACE PRINTS
-#ifdef USE_VERBOSE_TRACE
-#define VTRACE0(string)                 fprintf(stdout, (string));
-#define VTRACE1(string, p1)             fprintf(stdout, (string), (p1));
-#define VTRACE2(string, p1, p2)         fprintf(stdout, (string), (p1), (p2));
-#define VTRACE3(string, p1, p2, p3)     fprintf(stdout, (string), (p1), (p2), (p3));
-#define VTRACE4(string, p1, p2, p3, p4) fprintf(stdout, (string), (p1), (p2), (p3), (p4));
-#else
-#define VTRACE0(string)
-#define VTRACE1(string, p1)
-#define VTRACE2(string, p1, p2)
-#define VTRACE3(string, p1, p2, p3)
-#define VTRACE4(string, p1, p2, p3, p4)
-#endif
-
-
-void ThrowJavaMessageException(JNIEnv *e, const char *exClass, const char *msg);
--- /dev/null	2018-02-16 14:25:25.622524048 +0100
+++ new/src/java.desktop/share/native/common/sound/Utilities.h	2018-03-15 02:00:52.210586472 +0100
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+#include <jni.h>
+#include "jni_util.h"
+#include "SoundDefs.h"
+#include "Configure.h"          // put flags for debug msgs etc. here
+
+// return 1 if this platform is big endian, or 0 for little endian
+int UTIL_IsBigEndianPlatform();
+
+
+// ERROR PRINTS
+#ifdef USE_ERROR
+#define ERROR0(string)                        { fprintf(stdout, (string)); fflush(stdout); }
+#define ERROR1(string, p1)                    { fprintf(stdout, (string), (p1)); fflush(stdout); }
+#define ERROR2(string, p1, p2)                { fprintf(stdout, (string), (p1), (p2)); fflush(stdout); }
+#define ERROR3(string, p1, p2, p3)            { fprintf(stdout, (string), (p1), (p2), (p3)); fflush(stdout); }
+#define ERROR4(string, p1, p2, p3, p4)        { fprintf(stdout, (string), (p1), (p2), (p3), (p4)); fflush(stdout); }
+#else
+#define ERROR0(string)
+#define ERROR1(string, p1)
+#define ERROR2(string, p1, p2)
+#define ERROR3(string, p1, p2, p3)
+#define ERROR4(string, p1, p2, p3, p4)
+#endif
+
+
+// TRACE PRINTS
+#ifdef USE_TRACE
+#define TRACE0(string)                        { fprintf(stdout, (string)); fflush(stdout); }
+#define TRACE1(string, p1)                    { fprintf(stdout, (string), (p1)); fflush(stdout); }
+#define TRACE2(string, p1, p2)                { fprintf(stdout, (string), (p1), (p2)); fflush(stdout); }
+#define TRACE3(string, p1, p2, p3)            { fprintf(stdout, (string), (p1), (p2), (p3)); fflush(stdout); }
+#define TRACE4(string, p1, p2, p3, p4)        { fprintf(stdout, (string), (p1), (p2), (p3), (p4)); fflush(stdout); }
+#define TRACE5(string, p1, p2, p3, p4, p5)    { fprintf(stdout, (string), (p1), (p2), (p3), (p4), (p5)); fflush(stdout); }
+#else
+#define TRACE0(string)
+#define TRACE1(string, p1)
+#define TRACE2(string, p1, p2)
+#define TRACE3(string, p1, p2, p3)
+#define TRACE4(string, p1, p2, p3, p4)
+#define TRACE5(string, p1, p2, p3, p4, p5)
+#endif
+
+
+// VERBOSE TRACE PRINTS
+#ifdef USE_VERBOSE_TRACE
+#define VTRACE0(string)                 fprintf(stdout, (string));
+#define VTRACE1(string, p1)             fprintf(stdout, (string), (p1));
+#define VTRACE2(string, p1, p2)         fprintf(stdout, (string), (p1), (p2));
+#define VTRACE3(string, p1, p2, p3)     fprintf(stdout, (string), (p1), (p2), (p3));
+#define VTRACE4(string, p1, p2, p3, p4) fprintf(stdout, (string), (p1), (p2), (p3), (p4));
+#else
+#define VTRACE0(string)
+#define VTRACE1(string, p1)
+#define VTRACE2(string, p1, p2)
+#define VTRACE3(string, p1, p2, p3)
+#define VTRACE4(string, p1, p2, p3, p4)
+#endif
+
+
+void ThrowJavaMessageException(JNIEnv *e, const char *exClass, const char *msg);