diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2004-08-13 07:56:06 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2004-08-13 07:56:06 +0000 |
| commit | 5b6f86b37479ca44fd04cde915fe6ecf3a906dd1 (patch) | |
| tree | c33dc81c6e7d71cfffa0de2839d651d00ba2c6a3 /linuxthreads | |
| parent | 4d004cfb45f86696f764e2c92d9c2ea0c54a2bba (diff) | |
| download | glibc-5b6f86b37479ca44fd04cde915fe6ecf3a906dd1.tar.gz glibc-5b6f86b37479ca44fd04cde915fe6ecf3a906dd1.tar.xz glibc-5b6f86b37479ca44fd04cde915fe6ecf3a906dd1.zip | |
Update.
2004-08-09 Jakub Jelinek <jakub@redhat.com> * libc-tsd.c: Move resolv.h include before the #if. (__res_maybe_init): New function. Add libc_hidden_def.
Diffstat (limited to 'linuxthreads')
| -rw-r--r-- | linuxthreads/ChangeLog | 5 | ||||
| -rw-r--r-- | linuxthreads/libc-tsd.c | 11 |
2 files changed, 14 insertions, 2 deletions
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index cd5ff76e59..4203483956 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,3 +1,8 @@ +2004-08-09 Jakub Jelinek <jakub@redhat.com> + + * libc-tsd.c: Move resolv.h include before the #if. + (__res_maybe_init): New function. Add libc_hidden_def. + 2004-08-02 Ulrich Drepper <drepper@redhat.com> * linuxthreads.texi (Cleanup Handlers): Fix typo. diff --git a/linuxthreads/libc-tsd.c b/linuxthreads/libc-tsd.c index ea2497a65d..353ffb380a 100644 --- a/linuxthreads/libc-tsd.c +++ b/linuxthreads/libc-tsd.c @@ -1,5 +1,5 @@ /* Special hack used to build link-time libc.so object for linking libpthread. - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2004 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 @@ -18,13 +18,13 @@ Boston, MA 02111-1307, USA. */ #include <tls.h> +#include <resolv.h> #if ! USE___THREAD /* Special hack used to build link-time libc.so object for linking libpthread. See Makefile comments near libc_pic_lite.os rule for what this is for. */ -# include <resolv.h> # undef _res int _errno; @@ -32,3 +32,10 @@ int _h_errno; struct __res_state _res; #endif + +int +__res_maybe_init (res_state resp, int preinit) +{ + return -1; +} +libc_hidden_def (__res_maybe_init) |