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)