test/jdk/com/sun/tools/jextract/jclang-ffi/src/jdk/internal/clang/TranslationUnit.java

*** 30,44 ****
  import java.foreign.memory.LayoutType;
  import java.foreign.memory.Pointer;
  import java.io.IOException;
  import java.nio.file.Path;
  
! import clang.CXString.CXString;
! import clang.Index.CXDiagnostic;
! import clang.Index.CXToken;
! import clang.Index.CXTokenKind;
! import clang.Index.CXTranslationUnitImpl;
  
  public class TranslationUnit {
      private final Pointer<CXTranslationUnitImpl> tu;
      private final Scope scope = Scope.globalScope().fork();
  
--- 30,44 ----
  import java.foreign.memory.LayoutType;
  import java.foreign.memory.Pointer;
  import java.io.IOException;
  import java.nio.file.Path;
  
! import clang.CXString_h.CXString;
! import clang.Index_h.CXDiagnostic;
! import clang.Index_h.CXToken;
! import clang.Index_h.CXTokenKind;
! import clang.Index_h.CXTranslationUnitImpl;
  
  public class TranslationUnit {
      private final Pointer<CXTranslationUnitImpl> tu;
      private final Scope scope = Scope.globalScope().fork();
  
*** 49,59 ****
      public Cursor getCursor() {
          return new Cursor(LibClang.lib.clang_getTranslationUnitCursor(tu));
      }
  
      public Diagnostic[] getDiagnostics() {
!         final clang.Index lclang = LibClang.lib;
  
          int cntDiags = lclang.clang_getNumDiagnostics(tu);
          if (cntDiags == 0) {
              return null;
          }
--- 49,59 ----
      public Cursor getCursor() {
          return new Cursor(LibClang.lib.clang_getTranslationUnitCursor(tu));
      }
  
      public Diagnostic[] getDiagnostics() {
!         final clang.Index_h lclang = LibClang.lib;
  
          int cntDiags = lclang.clang_getNumDiagnostics(tu);
          if (cntDiags == 0) {
              return null;
          }