summaryrefslogtreecommitdiff
path: root/libpthread/linuxthreads/errno.c
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2015-02-14 23:00:19 -0600
committerWaldemar Brodkorb <wbx@openadk.org>2015-02-14 23:00:19 -0600
commit6b6ede3d15f04fe825cfa9f697507457e3640344 (patch)
treeefe9bf75eaf2200f89087ed0ef2ef350549ccd6d /libpthread/linuxthreads/errno.c
parentf972c2262fd4efc2bbf9789dce145bb705acec24 (diff)
resolve merge
Diffstat (limited to 'libpthread/linuxthreads/errno.c')
-rw-r--r--libpthread/linuxthreads/errno.c15
1 files changed, 1 insertions, 14 deletions
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