From: Dave Hart <hart@ntp.org>
Date: Fri, 16 Oct 2009 07:35:27 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:c:/ntp/ntp-dev-1339
X-Git-Tag: NTP_4_2_5P234_RC~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=388d0a0e6ba95c3bce611281a44162a41401ed6f;p=thirdparty%2Fntp.git

Merge shiny.ad.hartbrothers.com:c:/ntp/ntp-dev-1339
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1339-45-6-7

bk: 4ad8223fR4sXkVd6E7GXkppvIUFeKA
---

388d0a0e6ba95c3bce611281a44162a41401ed6f
diff --cc ChangeLog
index fb05eed91,c8e2025db..be719e9fc
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,5 +1,8 @@@
+ * [Bug 1339] redux, use unmodified lib/isc/win32/strerror.c and
+   move #define strerror... to a header not used by lib/isc code.
 +* [Bug 1345] illegal 'grep' option prevents compilation.
 +* [Bug 1346] keyword scanner broken where char defaults to unsigned.
 +* [Bug 1347] ntpd/complete.conf missing multicastclient test case.
  (4.2.5p233-RC) 2009/10/15 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1337] cast setsockopt() v4 address pointer to void *.
  * [Bug 1342] ignore|drop one IPv6 address on an interface blocks all