about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2016-09-13 15:08:37 +0200
committerFlorian Weimer <fweimer@redhat.com>2016-09-13 15:08:37 +0200
commitfd37b5a78ab215ea2599250ec345e25545410bce (patch)
tree8bab00aacbb8945b87cedceb71175e568adccf46
parent0f9317dcf578e5093462b9dcf6f4d691dff42cc9 (diff)
downloadglibc-fd37b5a78ab215ea2599250ec345e25545410bce.tar.gz
glibc-fd37b5a78ab215ea2599250ec345e25545410bce.tar.xz
glibc-fd37b5a78ab215ea2599250ec345e25545410bce.zip
resolv: Remove _LIBC_REENTRANT
-rw-r--r--ChangeLog4
-rw-r--r--resolv/res_init.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b417ee785c..8bf7507ca9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-09-13  Florian Weimer  <fweimer@redhat.com>
+
+	* resolv/res_init.c: Remove _LIBC_REENTRANT; it is always defined.
+
 2016-09-10  Siddhesh Poyarekar  <siddhesh@sourceware.org>
 
 	* malloc/Makefile (tests): Remove individual static test names
diff --git a/resolv/res_init.c b/resolv/res_init.c
index cea4c8a3cc..cfb8188ca1 100644
--- a/resolv/res_init.c
+++ b/resolv/res_init.c
@@ -542,7 +542,6 @@ res_nclose(res_state statp)
 }
 libc_hidden_def (__res_nclose)
 
-#ifdef _LIBC_REENTRANT
 /* This is called when a thread is exiting to free resources held in _res.  */
 static void __attribute__ ((section ("__libc_thread_freeres_fn")))
 res_thread_freeres (void)
@@ -558,4 +557,3 @@ res_thread_freeres (void)
 }
 text_set_element (__libc_thread_subfreeres, res_thread_freeres);
 text_set_element (__libc_subfreeres, res_thread_freeres);
-#endif