From: Dave Hart <hart@ntp.org>
Date: Fri, 20 Mar 2009 03:08:47 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:c:\ntp\ntp-stable-1124
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f673c35b5c5d674b387dd16474db9c079aeedcbf;p=thirdparty%2Fntp.git

Merge shiny.ad.hartbrothers.com:c:\ntp\ntp-stable-1124
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-pull

bk: 49c308bf6On9PAU7nHJJicGBBo3IHQ
---

f673c35b5c5d674b387dd16474db9c079aeedcbf
diff --cc ChangeLog
index 858ed1d412,4baccd53b4..8954db557e
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,7 +1,11 @@@
++
+ * [Bug 1117] Deferred interface binding under Windows works only correctly
+   if FORCE_DNSRETRY is defined
+ * [BUG 1124] Lock QueryPerformanceCounter() client threads to same CPU
 +* DPRINTF macro made safer, always evaluates to a statement and will not
 +  misassociate an else which follows the macro.
++
+ 
  ---
  (4.2.4p6) 2009/01/08 Released by Harlan Stenn <stenn@ntp.org>