diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2009-10-29 08:33:12 -0700 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2009-10-29 08:33:12 -0700 |
| commit | 92934e8b848fd55483606addf37687913a980bca (patch) | |
| tree | d2a193b39829a6b3e012c499e23183c924c3ad91 | |
| parent | 3a85895fa3e15b8d53856161a4ba3950d44ea285 (diff) | |
| download | glibc-92934e8b848fd55483606addf37687913a980bca.tar.gz glibc-92934e8b848fd55483606addf37687913a980bca.tar.xz glibc-92934e8b848fd55483606addf37687913a980bca.zip | |
Allow compat handling of getutmp.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | sysdeps/gnu/getutmp.c | 10 |
2 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 637f05a04f..0f5c45a7a1 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 7b6d7713ea..9647c252e2 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) |