Remerge of bugs 1448-1450

bk: 4b5bd4aet7jG9wIRk5sx8Oyo4fzwMQ

diff --git a/ChangeLog b/ChangeLog
index a4f9c117cd3767a2305a1b0a39a58faddc7c2ef5..83b300588db4c081439c8b83867d015639b8f94c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+* [Bug 1448] Some macros not correctly conditionally or absolutely defined
+  on Windows
+* [Bug 1449] ntpsim.h should be conditionally in ntp_config.c
+* [Bug 1450] Option to exclude warnings not unconditionally defined on Windows
 (4.2.7p9) 2010/01/13 Released by Harlan Stenn <stenn@ntp.org>
 (4.2.7p8) 2010/01/12 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 702] ntpd service logic should use libopts to examine cmdline.