Merge commit 'c9b1c294dc55296da9fcea929b2ddadfe0091c53' into users/meinersbur/flang_runtime_move-files

Author: Meinersbur

flang-rt/include/flang-rt/io-api-funcs.h

@@ -13,7 +13,7 @@
 
 #include "flang/Common/uint128.h"
 #include "flang/Runtime/entry-names.h"
-#include "flang/Runtime/io-api.h"
+#include "flang/Runtime/io-api-consts.h"
 #include "flang/Runtime/iostat.h"
 #include "flang/Runtime/magic-numbers.h"
 #include <cinttypes>

flang-rt/unittests/Runtime/ExternalIOTest.cpp

@@ -14,6 +14,7 @@
 #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"
 #include "flang/Runtime/stop.h"
 #include "llvm/Support/raw_ostream.h"

flang-rt/unittests/Runtime/ListInputTest.cpp

@@ -10,6 +10,7 @@
 #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"
 
 using namespace Fortran::runtime;
 using namespace Fortran::runtime::io;

flang-rt/unittests/Runtime/LogicalFormatTest.cpp

@@ -9,6 +9,7 @@
 #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>
 #include <cstring>

flang-rt/unittests/Runtime/Namelist.cpp

@@ -11,6 +11,7 @@
 #include "flang-rt/descriptor.h"
 #include "flang-rt/io-api-funcs.h"
 #include "tools.h"
+#include "flang/Runtime/io-api-consts.h"
 #include <algorithm>
 #include <cinttypes>
 #include <complex>

flang-rt/unittests/Runtime/NumericalFormatTest.cpp

@@ -8,6 +8,7 @@
 
 #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>

flang-rt/unittests/Runtime/RuntimeCrashTest.cpp

@@ -13,7 +13,7 @@
 #include "CrashHandlerFixture.h"
 #include "tools.h"
 #include "../../lib/flang_rt/terminator.h"
-#include "flang/Runtime/io-api.h"
+#include "flang/Runtime/io-api-consts.h"
 #include "flang/Runtime/transformational.h"
 #include <gtest/gtest.h>
 

flang/include/flang/Runtime/io-api.h renamed to flang/include/flang/Runtime/io-api-consts.h

@@ -1,4 +1,4 @@
-//===-- include/flang/Runtime/io-api.h --------------------------*- C++ -*-===//
+//===-- include/flang/Runtime/io-api-consts.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,8 +8,8 @@
 
 // Defines API between compiled code and I/O runtime library.
 
-#ifndef FORTRAN_RUNTIME_IO_API_H_
-#define FORTRAN_RUNTIME_IO_API_H_
+#ifndef FORTRAN_RUNTIME_IO_API_CONSTS_H_
+#define FORTRAN_RUNTIME_IO_API_CONSTS_H_
 
 #include "flang/Common/uint128.h"
 #include "flang/Runtime/entry-names.h"
@@ -366,4 +366,5 @@ enum Iostat IODECL(EndIoStatement)(Cookie);
 
 } // extern "C"
 } // namespace Fortran::runtime::io
-#endif
+
+#endif /* FORTRAN_RUNTIME_IO_API_CONSTS_H_ */

flang/lib/Lower/IO.cpp

@@ -33,7 +33,7 @@
 #include "flang/Optimizer/Dialect/FIRDialect.h"
 #include "flang/Optimizer/Dialect/Support/FIRContext.h"
 #include "flang/Parser/parse-tree.h"
-#include "flang/Runtime/io-api.h"
+#include "flang/Runtime/io-api-consts.h"
 #include "flang/Semantics/runtime-type-info.h"
 #include "flang/Semantics/tools.h"
 #include "mlir/Dialect/ControlFlow/IR/ControlFlowOps.h"