This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Making the trunk build on GNU/Hurd again
- From: Thomas Schwinge <tschwinge at gnu dot org>
- To: libc-alpha at sources dot redhat dot com
- Date: Thu, 15 Dec 2005 18:07:11 -0500
- Subject: Making the trunk build on GNU/Hurd again
Hi!
Please apply the following patch to make the trunk build on GNU/Hurd
again.
Regards,
Thomas
2005-12-15 Thomas Schwinge <tschwinge@gnu.org>
* io/xmknodat.c: Include <stddef.h>.
* misc/futimesat.c: Remove weak_alias() and correct stub_warning().
* stdio-common/renameat.c (renameat): Fix typo.
* sysdeps/gnu/glob64.c: Include <posix/glob.c>.
* sysdeps/gnu/updwtmp.c: Include <login/updwtmp.c>.
* sysdeps/gnu/utmp_file.c: Include <login/utmp_file.c>.
* sysdeps/mach/hurd/getdents.c: Include <dirent/getdents.c>.
* sysdeps/mach/hurd/ifreq.c: New file.
* sysdeps/mach/hurd/init-posix.c: Include <posix/init-posix.c>.
* sysdeps/mach/msync.c: Include <misc/msync.c>.
Index: io/xmknodat.c
===================================================================
RCS file: /cvs/glibc/libc/io/xmknodat.c,v
retrieving revision 1.1
diff -u -r1.1 xmknodat.c
--- io/xmknodat.c 14 Dec 2005 12:03:23 -0000 1.1
+++ io/xmknodat.c 15 Dec 2005 22:32:20 -0000
@@ -18,6 +18,7 @@
#include <errno.h>
#include <fcntl.h>
+#include <stddef.h>
#include <sys/types.h>
#include <sys/stat.h>
Index: misc/futimesat.c
===================================================================
RCS file: /cvs/glibc/libc/misc/futimesat.c,v
retrieving revision 1.1
diff -u -r1.1 futimesat.c
--- misc/futimesat.c 14 Dec 2005 09:02:08 -0000 1.1
+++ misc/futimesat.c 15 Dec 2005 22:32:21 -0000
@@ -42,7 +42,5 @@
return -1;
}
-weak_alias (__utimes, utimes)
-
-stub_warning (utimes)
+stub_warning (futimesat)
#include <stub-tag.h>
Index: stdio-common/renameat.c
===================================================================
RCS file: /cvs/glibc/libc/stdio-common/renameat.c,v
retrieving revision 1.1
diff -u -r1.1 renameat.c
--- stdio-common/renameat.c 14 Dec 2005 10:09:25 -0000 1.1
+++ stdio-common/renameat.c 15 Dec 2005 22:32:24 -0000
@@ -29,7 +29,7 @@
int newfd;
const char *new;
{
- if ((oldfd < 0 & oldfd !_ AT_FDCWD) || (newfd < 0 && newfd != AT_FDCWD))
+ if ((oldfd < 0 & oldfd != AT_FDCWD) || (newfd < 0 && newfd != AT_FDCWD))
{
__set_errno (EBADF);
return -1;
Index: sysdeps/gnu/glob64.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/gnu/glob64.c,v
retrieving revision 1.4
diff -u -r1.4 glob64.c
--- sysdeps/gnu/glob64.c 1 Jul 2004 17:39:25 -0000 1.4
+++ sysdeps/gnu/glob64.c 15 Dec 2005 22:32:24 -0000
@@ -19,7 +19,7 @@
#define COMPILE_GLOB64 1
-#include <sysdeps/generic/glob.c>
+#include <posix/glob.c>
libc_hidden_def (glob64)
libc_hidden_def (globfree64)
Index: sysdeps/gnu/updwtmp.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/gnu/updwtmp.c,v
retrieving revision 1.2
diff -u -r1.2 updwtmp.c
--- sysdeps/gnu/updwtmp.c 6 Jul 2001 04:55:51 -0000 1.2
+++ sysdeps/gnu/updwtmp.c 15 Dec 2005 22:32:24 -0000
@@ -27,4 +27,4 @@
&& __access (_PATH_WTMP "x", F_OK) != 0) ? _PATH_WTMP : \
file_name))
-#include <sysdeps/generic/updwtmp.c>
+#include <login/updwtmp.c>
Index: sysdeps/gnu/utmp_file.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/gnu/utmp_file.c,v
retrieving revision 1.3
diff -u -r1.3 utmp_file.c
--- sysdeps/gnu/utmp_file.c 6 Jul 2001 04:55:51 -0000 1.3
+++ sysdeps/gnu/utmp_file.c 15 Dec 2005 22:32:24 -0000
@@ -27,4 +27,4 @@
&& __access (_PATH_WTMP "x", F_OK) != 0) ? _PATH_WTMP : \
file_name))
-#include <sysdeps/generic/utmp_file.c>
+#include <login/utmp_file.c>
Index: sysdeps/mach/msync.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/mach/msync.c,v
retrieving revision 1.1
diff -u -r1.1 msync.c
--- sysdeps/mach/msync.c 19 Feb 2002 00:21:46 -0000 1.1
+++ sysdeps/mach/msync.c 15 Dec 2005 22:32:27 -0000
@@ -26,7 +26,7 @@
define the VM_SYNC_* bits when we include <mach/mach_types.h>. */
#ifndef VM_SYNC_SYNCHRONOUS
-# include <sysdeps/generic/msync.c>
+# include <misc/msync.c>
#else
/* Synchronize the region starting at ADDR and extending LEN bytes with the
Index: sysdeps/mach/hurd/getdents.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/mach/hurd/getdents.c,v
retrieving revision 1.12
diff -u -r1.12 getdents.c
--- sysdeps/mach/hurd/getdents.c 1 Aug 2003 08:14:26 -0000 1.12
+++ sysdeps/mach/hurd/getdents.c 15 Dec 2005 22:32:27 -0000
@@ -1 +1 @@
-#include <sysdeps/generic/getdents.c>
+#include <dirent/getdents.c>
Index: sysdeps/mach/hurd/init-posix.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/mach/hurd/init-posix.c,v
retrieving revision 1.1
diff -u -r1.1 init-posix.c
--- sysdeps/mach/hurd/init-posix.c 13 Aug 2001 02:04:31 -0000 1.1
+++ sysdeps/mach/hurd/init-posix.c 15 Dec 2005 22:32:27 -0000
@@ -1,2 +1,2 @@
/* We don't need the unix/bsd version. */
-#include <sysdeps/generic/init-posix.c>
+#include <posix/init-posix.c>
--- /dev/null 2005-12-01 12:25:02.924448392 +0100
+++ sysdeps/mach/hurd/ifreq.c 2005-12-15 23:33:48.000000000 +0100
@@ -0,0 +1 @@
+#include "ifreq.h"