* cygtls.h (unionent): Move from net.cc.

(unionent::struct_type): Move enum here.
(_local_storage::hostent_buf): Define as unionent.
(_local_storage::protoent_buf): Ditto.
(_local_storage::servent_buf): Ditto.
* net.cc (unionent): Move to cygtls.h.
(struct_type): Ditto.
(dup_ent): Define one function per {host,proto,serv}ent type.
(cygwin_getprotobyname): Simplify dup_ent call.  Removed now-unneeded return
type coercion.
(cygwin_getprotobynumber): Ditto.
(cygwin_getservbyname): Ditto.
(cygwin_getservbyport): Ditto.
(cygwin_gethostbyname): Ditto.
(cygwin_gethostbyaddr): Ditto.  tlsoffsets.h: Regenerate.

1 files changed, 49 insertions, 49 deletions

diff --git a/winsup/cygwin/tlsoffsets.h b/winsup/cygwin/tlsoffsets.h
index 52ed5c068..7c316518e 100644
--- a/winsup/cygwin/tlsoffsets.h
+++ b/winsup/cygwin/tlsoffsets.h
@@ -1,6 +1,6 @@
 //;# autogenerated:  Do not edit.
 
-//; $tls::sizeof__cygtls = 4292;
+//; $tls::sizeof__cygtls = 4296;
 //; $tls::func = -12700;
 //; $tls::pfunc = 0;
 //; $tls::el = -12696;
@@ -39,30 +39,30 @@
 //; $tls::p__dontuse = 420;
 //; $tls::locals = -11216;
 //; $tls::plocals = 1484;
-//; $tls::_ctinfo = -9512;
-//; $tls::p_ctinfo = 3188;
-//; $tls::andreas = -9508;
-//; $tls::pandreas = 3192;
-//; $tls::wq = -9492;
-//; $tls::pwq = 3208;
-//; $tls::prev = -9464;
-//; $tls::pprev = 3236;
-//; $tls::next = -9460;
-//; $tls::pnext = 3240;
-//; $tls::sig = -9456;
-//; $tls::psig = 3244;
-//; $tls::incyg = -9452;
-//; $tls::pincyg = 3248;
-//; $tls::spinning = -9448;
-//; $tls::pspinning = 3252;
-//; $tls::stacklock = -9444;
-//; $tls::pstacklock = 3256;
-//; $tls::stackptr = -9440;
-//; $tls::pstackptr = 3260;
-//; $tls::stack = -9436;
-//; $tls::pstack = 3264;
-//; $tls::initialized = -8412;
-//; $tls::pinitialized = 4288;
+//; $tls::_ctinfo = -9508;
+//; $tls::p_ctinfo = 3192;
+//; $tls::andreas = -9504;
+//; $tls::pandreas = 3196;
+//; $tls::wq = -9488;
+//; $tls::pwq = 3212;
+//; $tls::prev = -9460;
+//; $tls::pprev = 3240;
+//; $tls::next = -9456;
+//; $tls::pnext = 3244;
+//; $tls::sig = -9452;
+//; $tls::psig = 3248;
+//; $tls::incyg = -9448;
+//; $tls::pincyg = 3252;
+//; $tls::spinning = -9444;
+//; $tls::pspinning = 3256;
+//; $tls::stacklock = -9440;
+//; $tls::pstacklock = 3260;
+//; $tls::stackptr = -9436;
+//; $tls::pstackptr = 3264;
+//; $tls::stack = -9432;
+//; $tls::pstack = 3268;
+//; $tls::initialized = -8408;
+//; $tls::pinitialized = 4292;
 //; __DATA__
 
 #define tls_func (-12700)
@@ -103,27 +103,27 @@
 #define tls_p__dontuse (420)
 #define tls_locals (-11216)
 #define tls_plocals (1484)
-#define tls__ctinfo (-9512)
-#define tls_p_ctinfo (3188)
-#define tls_andreas (-9508)
-#define tls_pandreas (3192)
-#define tls_wq (-9492)
-#define tls_pwq (3208)
-#define tls_prev (-9464)
-#define tls_pprev (3236)
-#define tls_next (-9460)
-#define tls_pnext (3240)
-#define tls_sig (-9456)
-#define tls_psig (3244)
-#define tls_incyg (-9452)
-#define tls_pincyg (3248)
-#define tls_spinning (-9448)
-#define tls_pspinning (3252)
-#define tls_stacklock (-9444)
-#define tls_pstacklock (3256)
-#define tls_stackptr (-9440)
-#define tls_pstackptr (3260)
-#define tls_stack (-9436)
-#define tls_pstack (3264)
-#define tls_initialized (-8412)
-#define tls_pinitialized (4288)
+#define tls__ctinfo (-9508)
+#define tls_p_ctinfo (3192)
+#define tls_andreas (-9504)
+#define tls_pandreas (3196)
+#define tls_wq (-9488)
+#define tls_pwq (3212)
+#define tls_prev (-9460)
+#define tls_pprev (3240)
+#define tls_next (-9456)
+#define tls_pnext (3244)
+#define tls_sig (-9452)
+#define tls_psig (3248)
+#define tls_incyg (-9448)
+#define tls_pincyg (3252)
+#define tls_spinning (-9444)
+#define tls_pspinning (3256)
+#define tls_stacklock (-9440)
+#define tls_pstacklock (3260)
+#define tls_stackptr (-9436)
+#define tls_pstackptr (3264)
+#define tls_stack (-9432)
+#define tls_pstack (3268)
+#define tls_initialized (-8408)
+#define tls_pinitialized (4292)