Post-merge fixes

Meinersbur · Meinersbur · commit fe3a105b6322 · 2024-12-05T14:28:46.000+01:00
diff --git a/flang-rt/lib/flang_rt/extensions.cpp b/flang-rt/lib/flang_rt/extensions.cpp
@@ -11,7 +11,6 @@
 
 #include "flang/Runtime/extensions.h"
 #include "flang-rt/descriptor.h"
-#include "flang-rt/io-api-funcs.h"
 #include "terminator.h"
 #include "tools.h"
 #include "flang/Runtime/command.h"
diff --git a/flang-rt/lib/flang_rt/io-api-common.h b/flang-rt/lib/flang_rt/io-api-common.h
@@ -9,7 +9,6 @@
 #ifndef FLANG_RT_IO_API_COMMON_H_
 #define FLANG_RT_IO_API_COMMON_H_
 
-#include "flang-rt/io-api-funcs.h"
 #include "io-stmt.h"
 #include "terminator.h"
 #include "unit.h"
diff --git a/flang-rt/lib/flang_rt/io-api-minimal.cpp b/flang-rt/lib/flang_rt/io-api-minimal.cpp
@@ -10,7 +10,6 @@
 // list-directed output (PRINT *) of intrinsic types.
 
 #include "edit-output.h"
-#include "flang-rt/io-api-funcs.h"
 #include "format.h"
 #include "io-api-common.h"
 #include "io-stmt.h"
diff --git a/flang-rt/lib/flang_rt/io-api.cpp b/flang-rt/lib/flang_rt/io-api.cpp
@@ -19,7 +19,6 @@
 #include "edit-output.h"
 #include "environment.h"
 #include "flang-rt/descriptor.h"
-#include "flang-rt/io-api-funcs.h"
 #include "flang-rt/memory.h"
 #include "format.h"
 #include "io-api-common.h"
diff --git a/flang-rt/lib/flang_rt/io-stmt.h b/flang-rt/lib/flang_rt/io-stmt.h
@@ -14,7 +14,6 @@
 #include "connection.h"
 #include "file.h"
 #include "flang-rt/descriptor.h"
-#include "flang-rt/io-api-funcs.h"
 #include "format.h"
 #include "internal-unit.h"
 #include "io-error.h"
diff --git a/flang-rt/lib/flang_rt/namelist.cpp b/flang-rt/lib/flang_rt/namelist.cpp
@@ -9,7 +9,6 @@
 #include "namelist.h"
 #include "descriptor-io.h"
 #include "emit-encoded.h"
-#include "flang-rt/io-api-funcs.h"
 #include "io-stmt.h"
 #include "flang/Runtime/io-api.h"
 #include <algorithm>
diff --git a/flang-rt/unittests/Runtime/ExternalIOTest.cpp b/flang-rt/unittests/Runtime/ExternalIOTest.cpp
@@ -12,7 +12,6 @@
 
 #include "CrashHandlerFixture.h"
 #include "flang-rt/descriptor.h"
-#include "flang-rt/io-api-funcs.h"
 #include "gtest/gtest.h"
 #include "flang/Runtime/io-api-consts.h"
 #include "flang/Runtime/main.h"
diff --git a/flang-rt/unittests/Runtime/ListInputTest.cpp b/flang-rt/unittests/Runtime/ListInputTest.cpp
@@ -8,7 +8,6 @@
 
 #include "CrashHandlerFixture.h"
 #include "flang-rt/descriptor.h"
-#include "flang-rt/io-api-funcs.h"
 #include "../../lib/flang_rt/io-error.h"
 #include "flang/Runtime/io-api-consts.h"
 
diff --git a/flang-rt/unittests/Runtime/LogicalFormatTest.cpp b/flang-rt/unittests/Runtime/LogicalFormatTest.cpp
@@ -8,7 +8,6 @@
 
 #include "CrashHandlerFixture.h"
 #include "flang-rt/descriptor.h"
-#include "flang-rt/io-api-funcs.h"
 #include "flang/Runtime/io-api-consts.h"
 #include <algorithm>
 #include <array>
diff --git a/flang-rt/unittests/Runtime/Namelist.cpp b/flang-rt/unittests/Runtime/Namelist.cpp
@@ -9,7 +9,6 @@
 #include "../../lib/flang_rt/namelist.h"
 #include "CrashHandlerFixture.h"
 #include "flang-rt/descriptor.h"
-#include "flang-rt/io-api-funcs.h"
 #include "tools.h"
 #include "flang/Runtime/io-api-consts.h"
 #include <algorithm>
diff --git a/flang-rt/unittests/Runtime/NumericalFormatTest.cpp b/flang-rt/unittests/Runtime/NumericalFormatTest.cpp
@@ -9,7 +9,6 @@
 #include "CrashHandlerFixture.h"
 #include "flang-rt/descriptor.h"
 #include "flang/Runtime/io-api-consts.h"
-#include "flang-rt/io-api-funcs.h"
 #include <algorithm>
 #include <array>
 #include <cstring>
diff --git a/flang/include/flang/Runtime/io-api.h b/flang/include/flang/Runtime/io-api.h
@@ -1,4 +1,4 @@
-//===-- include/flang-rt/io-api-funcs.h -------------------------*- C++ -*-===//
+//===-- include/flang-rt/io-api.h -------------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -8,16 +8,8 @@
 
 // Defines API between compiled code and I/O runtime library.
 
-<<<<<<<< HEAD:flang-rt/include/flang-rt/io-api-funcs.h
-#ifndef FLANG_RT_IO_API_FUNCS_H_
-#define FLANG_RT_IO_API_FUNCS_H_
-|||||||| c9b1c294dc55:flang/include/flang/Runtime/io-api-funcs.h
-#ifndef FORTRAN_RUNTIME_IO_API_FUNCS_H_
-#define FORTRAN_RUNTIME_IO_API_FUNCS_H_
-========
 #ifndef FORTRAN_RUNTIME_IO_API_H_
 #define FORTRAN_RUNTIME_IO_API_H_
->>>>>>>> bd392d22ef084d32c5b82af1010d3a4591bda0f0:flang/include/flang/Runtime/io-api.h
 
 #include "flang/Common/uint128.h"
 #include "flang/Runtime/entry-names.h"
