From 3ce1f2959437e952b9db4eaeed2407424f11a4d1 Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@gmail.com>
Date: Sat, 10 Sep 2011 14:34:15 -0400
Subject: Cleanup of configuration options

Make several tool features mandatory and simplify the code.
---
 resolv/Versions    | 11 -----------
 resolv/res_hconf.c |  4 +---
 2 files changed, 1 insertion(+), 14 deletions(-)

(limited to 'resolv')

diff --git a/resolv/Versions b/resolv/Versions
index 4b2e5e9dbc..93faf1e2f5 100644
--- a/resolv/Versions
+++ b/resolv/Versions
@@ -2,11 +2,6 @@
 
 libc {
   GLIBC_2.0 {
-%if !HAVE___THREAD
-    # global variables
-    _h_errno;
-%endif
-
     _res;
 
     # helper functions
@@ -17,9 +12,6 @@ libc {
 
     # variables in normal name space
     h_errlist; h_nerr;
-%if !HAVE___THREAD
-    h_errno;
-%endif
 
     # h*
     herror; hstrerror;
@@ -34,10 +26,7 @@ libc {
   GLIBC_PRIVATE {
     __gai_sigqueue;
 
-%if HAVE___THREAD
-    # This version is for the TLS symbol, GLIBC_2.0 is the old object symbol.
     h_errno; __resp;
-%endif
 
     __res_maybe_init; __res_iclose;
   }
diff --git a/resolv/res_hconf.c b/resolv/res_hconf.c
index fc4b83f7c3..7b167bb3bf 100644
--- a/resolv/res_hconf.c
+++ b/resolv/res_hconf.c
@@ -46,9 +46,7 @@
 #include <bits/libc-lock.h>
 #include "ifreq.h"
 #include "res_hconf.h"
-#ifdef USE_IN_LIBIO
-# include <wchar.h>
-#endif
+#include <wchar.h>
 
 #define _PATH_HOSTCONF	"/etc/host.conf"
 
-- 
cgit 1.4.1