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

Author: Meinersbur

flang-rt/lib/flang_rt/extensions.cpp

@@ -16,6 +16,7 @@
 #include "tools.h"
 #include "flang/Runtime/command.h"
 #include "flang/Runtime/entry-names.h"
+#include "flang/Runtime/io-api.h"
 #include <chrono>
 #include <cstring>
 #include <ctime>

flang-rt/lib/flang_rt/io-api-common.h

@@ -15,6 +15,7 @@
 #include "unit.h"
 #include "flang/Common/api-attrs.h"
 #include "flang/Common/optional.h"
+#include "flang/Runtime/io-api.h"
 
 namespace Fortran::runtime::io {
 

flang-rt/lib/flang_rt/io-api-minimal.cpp

@@ -17,6 +17,7 @@
 #include "terminator.h"
 #include "tools.h"
 #include "unit.h"
+#include "flang/Runtime/io-api.h"
 
 namespace Fortran::runtime::io {
 RT_EXT_API_GROUP_BEGIN

flang-rt/lib/flang_rt/io-api.cpp

@@ -13,6 +13,7 @@
 // OutputReal{32,64}, OutputComplex{32,64}, OutputAscii, & EndIoStatement()
 // are in runtime/io-api-minimal.cpp.
 
+#include "flang/Runtime/io-api.h"
 #include "descriptor-io.h"
 #include "edit-input.h"
 #include "edit-output.h"

flang-rt/lib/flang_rt/io-stmt.h

@@ -21,6 +21,7 @@
 #include "flang/Common/optional.h"
 #include "flang/Common/reference-wrapper.h"
 #include "flang/Common/visit.h"
+#include "flang/Runtime/io-api.h"
 #include <flang/Common/variant.h>
 #include <functional>
 #include <type_traits>

flang-rt/lib/flang_rt/namelist.cpp

@@ -11,6 +11,7 @@
 #include "emit-encoded.h"
 #include "flang-rt/io-api-funcs.h"
 #include "io-stmt.h"
+#include "flang/Runtime/io-api.h"
 #include <algorithm>
 #include <cstring>
 #include <limits>

flang-rt/include/flang-rt/io-api-funcs.h renamed to flang/include/flang/Runtime/io-api.h

@@ -8,8 +8,16 @@
 
 // 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"
@@ -37,4 +45,4 @@ RT_API_ATTRS const char *InquiryKeywordHashDecode(
 
 } // namespace Fortran::runtime::io
 
-#endif /* FORTRAN_RUNTIME_IO_API_FUNCS_H_ */
+#endif /* FORTRAN_RUNTIME_IO_API_H_ */