This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch, master, updated. glibc-2.10-369-g92934e8
- From: drepper at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 29 Oct 2009 15:33:27 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.10-369-g92934e8
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 92934e8b848fd55483606addf37687913a980bca (commit)
from 3a85895fa3e15b8d53856161a4ba3950d44ea285 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=92934e8b848fd55483606addf37687913a980bca
commit 92934e8b848fd55483606addf37687913a980bca
Author: Ulrich Drepper <drepper@redhat.com>
Date: Thu Oct 29 08:33:12 2009 -0700
Allow compat handling of getutmp.
diff --git a/ChangeLog b/ChangeLog
index 637f05a..0f5c45a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2009-10-29 Ulrich Drepper <drepper@redhat.com>
+ [BZ #10847]
+ * sysdeps/gnu/getutmp.c: Allow compatibility code to play around with
+ getutmpx symbol.
+
+ [BZ #10823]
* resolv/res_send.c (__libc_res_nsend): Fix copying of IPv4 server
addresses. Patch by Petar Bogdanovic <petar@smokva.net>.
diff --git a/sysdeps/gnu/getutmp.c b/sysdeps/gnu/getutmp.c
index 7b6d771..9647c25 100644
--- a/sysdeps/gnu/getutmp.c
+++ b/sysdeps/gnu/getutmp.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1999, 2009 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -19,10 +19,12 @@
#include <assert.h>
#include <string.h>
#include <utmp.h>
+#ifndef _UTMPX_H
/* This is an ugly hack but we must not see the getutmpx declaration. */
-#define getutmpx XXXgetutmpx
-#include <utmpx.h>
-#undef getutmpx
+# define getutmpx XXXgetutmpx
+# include <utmpx.h>
+# undef getutmpx
+#endif
void
getutmp (const struct utmpx *utmpx, struct utmp *utmp)
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
sysdeps/gnu/getutmp.c | 10 ++++++----
2 files changed, 11 insertions(+), 4 deletions(-)
hooks/post-receive
--
GNU C Library master sources