--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/JavahTask.java	Fri Dec 16 12:08:46 2016 +0100
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/JavahTask.java	Fri Dec 16 15:27:34 2016 +0000
@@ -310,15 +310,12 @@
 
     private DiagnosticListener<JavaFileObject> getDiagnosticListenerForWriter(Writer w) {
         final PrintWriter pw = getPrintWriterForWriter(w);
-        return new DiagnosticListener<JavaFileObject> () {
-            @DefinedBy(Api.COMPILER)
-            public void report(Diagnostic<? extends JavaFileObject> diagnostic) {
-                if (diagnostic.getKind() == Diagnostic.Kind.ERROR) {
-                    pw.print(getMessage("err.prefix"));
-                    pw.print(" ");
-                }
-                pw.println(diagnostic.getMessage(null));
+        return diagnostic -> {
+            if (diagnostic.getKind() == Diagnostic.Kind.ERROR) {
+                pw.print(getMessage("err.prefix"));
+                pw.print(" ");
             }
+            pw.println(diagnostic.getMessage(null));
         };
     }