This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[COMMITTED PATCH] fopen64 clean-up
- From: Roland McGrath <roland at hack dot frob dot com>
- To: libc-alpha at sourceware dot org
- Date: Wed, 1 Aug 2012 16:37:35 -0700 (PDT)
- Subject: [COMMITTED PATCH] fopen64 clean-up
Another (maybe the last?) in the O_LARGEFILE==0 cleanup.
Thanks,
Roland
2012-08-01 Roland McGrath <roland@hack.frob.com>
* libio/iofopen.c: Include <fcntl.h>.
[_LIBC] [!defined O_LARGEFILE || O_LARGEFILE == 0]
(_IO_fopen64, fopen64): Define as aliases.
* libio/iofopen64.c: Include <fcntl.h>.
[!defined _LIBC || (defined O_LARGEFILE && O_LARGEFILE != 0)]:
Conditionalize body on this.
* sysdeps/wordsize-64/iofopen.c: File removed.
* sysdeps/wordsize-64/iofopen64.c: File removed.
diff --git a/libio/iofopen.c b/libio/iofopen.c
index 8edd32e..a7e69e4 100644
--- a/libio/iofopen.c
+++ b/libio/iofopen.c
@@ -25,6 +25,7 @@
in files containing the exception. */
#include "libioP.h"
+#include <fcntl.h>
#include <stdlib.h>
#include <stddef.h>
#ifdef _LIBC
@@ -106,4 +107,9 @@ _IO_new_fopen (filename, mode)
strong_alias (_IO_new_fopen, __new_fopen)
versioned_symbol (libc, _IO_new_fopen, _IO_fopen, GLIBC_2_1);
versioned_symbol (libc, __new_fopen, fopen, GLIBC_2_1);
+
+# if !defined O_LARGEFILE || O_LARGEFILE == 0
+weak_alias (_IO_new_fopen, _IO_fopen64)
+weak_alias (_IO_new_fopen, fopen64)
+# endif
#endif
diff --git a/libio/iofopen64.c b/libio/iofopen64.c
index 1b1a487..25c79c9 100644
--- a/libio/iofopen64.c
+++ b/libio/iofopen64.c
@@ -25,8 +25,12 @@
in files containing the exception. */
#include "libioP.h"
+#include <fcntl.h>
#include <stdlib.h>
+/* iofopen.c defines _IO_fopen64/fopen64 as aliases if O_LARGEFILE==0. */
+#if !defined _LIBC || (defined O_LARGEFILE && O_LARGEFILE != 0)
+
_IO_FILE *
_IO_fopen64 (filename, mode)
const char *filename;
@@ -43,3 +47,5 @@ _IO_fopen64 (filename, mode)
#ifdef weak_alias
weak_alias (_IO_fopen64, fopen64)
#endif
+
+#endif
diff --git a/sysdeps/wordsize-64/iofopen.c b/sysdeps/wordsize-64/iofopen.c
deleted file mode 100644
index d8d92ca..0000000
--- a/sysdeps/wordsize-64/iofopen.c
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "../../libio/iofopen.c"
-
-weak_alias (_IO_new_fopen, _IO_fopen64)
-weak_alias (_IO_new_fopen, fopen64)
diff --git a/sysdeps/wordsize-64/iofopen64.c b/sysdeps/wordsize-64/iofopen64.c
deleted file mode 100644
index 68315d8..0000000
--- a/sysdeps/wordsize-64/iofopen64.c
+++ /dev/null
@@ -1 +0,0 @@
-/* Defined in iofopen.c. */