Move open_file to largefile_wrappers.h

* util.c (open_file): Move it ...
* largefile_wrappers.h: ... here.

diff --git a/largefile_wrappers.h b/largefile_wrappers.h
index 508882c4b7ea4c17fd21b42214c60bfb3e2621f7..fc178006411665cbd4b2d6cc96574407d76db1ac 100644 (file)
--- a/largefile_wrappers.h
+++ b/largefile_wrappers.h
@@ -14,6 +14,11 @@
 # include "defs.h"
 
 # ifdef _LARGEFILE64_SOURCE
+#  ifdef HAVE_OPEN64
+#   define open_file open64
+#  else
+#   define open_file open
+#  endif
 #  ifdef HAVE_FOPEN64
 #   define fopen_stream fopen64
 #  else
@@ -26,6 +31,7 @@
 #  define struct_rlimit struct rlimit64
 #  define set_rlimit setrlimit64
 # else
+#  define open_file open
 #  define fopen_stream fopen
 #  define struct_stat struct stat
 #  define stat_file stat

diff --git a/util.c b/util.c
index 6190f550b434efa6bb26f9d86304ff9f89bd0a6e..7dec473f06a721f8d67f549c88a172f488ff464a 100644 (file)
--- a/util.c
+++ b/util.c
@@ -1351,12 +1351,6 @@ print_abnormal_hi(const kernel_ulong_t val)
        }
 }
 
-#if defined _LARGEFILE64_SOURCE && defined HAVE_OPEN64
-# define open_file open64
-#else
-# define open_file open
-#endif
-
 int
 read_int_from_file(struct tcb *tcp, const char *const fname, int *const pvalue)
 {