#
#
# patch "ChangeLog"
#  from [428fa4b4c88b4b5bd153258040295561a7affc1e]
#    to [26f17be23e4c617836a891feb2a75508c958a6bf]
#
# patch "netxx/resolve_gethostbyname.cxx"
#  from [437824be17040a618e45076079ed481653a77895]
#    to [dcbcbaf6733936797b1edfdd9d27008103763e27]
#
============================================================
--- ChangeLog	428fa4b4c88b4b5bd153258040295561a7affc1e
+++ ChangeLog	26f17be23e4c617836a891feb2a75508c958a6bf
@@ -1,5 +1,10 @@
 2006-04-08  Nathaniel Smith  <address@hidden>

+	* netxx/resolve_gethostbyname.cxx (resolve_hostname): #ifdef out
+	Win32-incompatible error reporting call.
+
+2006-04-08  Nathaniel Smith  <address@hidden>
+
 	* netsync.cc, annotate.cc: Turn all ticker labels from _() to
 	N_(), to match Benoît's changes to the ticker class.

============================================================
--- netxx/resolve_gethostbyname.cxx	437824be17040a618e45076079ed481653a77895
+++ netxx/resolve_gethostbyname.cxx	dcbcbaf6733936797b1edfdd9d27008103763e27
@@ -80,7 +80,10 @@
     hostent *he; // WARNING not MT safe
     if ( (he = gethostbyname(hostname)) == 0) {
 	std::string error("name resolution failure for "); error += hostname;
+// HACK: Winsock uses a totally different error reporting mechanism.
+#ifndef WIN32
 	error += ": "; error += hstrerror(h_errno);
+#endif // WIN32
 	throw NetworkException(error);
     }