From 6b6ede3d15f04fe825cfa9f697507457e3640344 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 14 Feb 2015 23:00:19 -0600
Subject: resolve merge

---
 libpthread/linuxthreads/errno.c | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

(limited to 'libpthread/linuxthreads/errno.c')

diff --git a/libpthread/linuxthreads/errno.c b/libpthread/linuxthreads/errno.c
index b8d9eb343..748c1d512 100644
--- a/libpthread/linuxthreads/errno.c
+++ b/libpthread/linuxthreads/errno.c
@@ -16,12 +16,10 @@
 
 #include <errno.h>
 #include <netdb.h>
-#include <resolv.h>
 #include "pthread.h"
 #include "internals.h"
+#include <stdio.h>
 
-#ifndef __UCLIBC_HAS_TLS__
-/* The definition in libc is sufficient if we use TLS.  */
 int *
 __errno_location (void)
 {
@@ -35,14 +33,3 @@ __h_errno_location (void)
   pthread_descr self = thread_self();
   return THREAD_GETMEM (self, p_h_errnop);
 }
-
-#if 0
-/* Return thread specific resolver state.  */
-struct __res_state *
-__res_state (void)
-{
-  pthread_descr self = thread_self();
-  return THREAD_GETMEM (self, p_resp);
-}
-#endif
-#endif
-- 
cgit v1.2.3