Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-maxalign

into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1837

bk: 4d656058k-m9mWCtIJpSgSc9wSSyYQ

diff --cc ChangeLog
index 48779b6becee6ff2e1c5b7b9161fc05c1f05568d,3728ff209229e0306a7f889672fa5adeaf5c1cd8..904614947e22d8659ba49f772fed4e3de207c031
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,54 -1,4 +1,55 @@@
 +* [Bug 1834] ntpdate 4.2.7p131 aborts with assertion failure.
 +* [Bug 1837] Build fails on Win7 due to regedit requiring privilege.
 +* Provide fallback definitions for GetAdaptersAddresses() for Windows
 +  build environments lacking iphlpapi.h.
 +* Move sntp last in top-level Makefile.am SUBDIRS so that the libevent
 +  tearoff (if required) and sntp are compiled after the rest.
 +* Use a single set of Automake options for each package in configure.ac
 +  AM_INIT, remove Makefile.am AUTOMAKE_OPTIONS= lines.
 +* Correct spurious sntp rebuilds triggered by a make misperception
 +  sntp/version was out-of-date relative to phony target FRC.version.
 +* Do not cache paths to perl, test, or pkg-config, searching the PATH
 +  at configure time is worth it to pick up tool updates.
 +* Rename file containing 1.xxxx ChangeSet revision from version to
 +  scm-rev to avoid invoking GNU make implicit rules attempting to
 +  compile version.c into version.  Problem was with sntp/version.o
 +  during make distcheck after fix for spurious sntp rebuilds.
+ * Add INC_ALIGNED_PTR() macro to align pointers like malloc().
 +(4.2.7p132) 2011/02/22 Released by Harlan Stenn <stenn@ntp.org>
 +* [Bug 1832] ntpdate doesn't allow timeout > 2s.
 +* [Bug 1833] The checking sem_timedwait() fails without -pthread.
 +* ElectricFence was suffering bitrot - remove it.  valgrind works well.
 +* Enable all relevant automake warnings.
 +* Correct Solaris 2.1x PTHREAD_ONCE_INIT extra braces test to avoid
 +  triggering warnings due to excess braces.
 +* Remove libevent-cfg from sntp/Makefile.am.
 +* Provide bug report and URL options to Autoconf.
 +* Avoid relying on remake rules for routine build/flock-build for
 +  libevent as for the top-level and sntp subproject.
 +(4.2.7p131) 2011/02/21 Released by Harlan Stenn <stenn@ntp.org>
 +* [Bug 1087] -v/--normalverbose conflicts with -v/--version in sntp.
 +* [Bug 1088] sntp should (only) report the time difference without -s/-a.
 +* older autoconf sometimes dislikes [].
 +* Move "can't write KoD file" warning from sntp shutdown to startup.
 +* refclock_acts.c cleanup from Dave Mills.
 +* Convert sntp to libevent event-driven socket programming.  Instead of
 +  blocking name resolution and querying one NTP server at a time,
 +  resolve server names and send NTP queries without blocking.  Add
 +  sntp command-line options to adjust timing and optionally wait for all
 +  servers to respond instead of exiting after the first.
 +* Import libevent 2.0.10-stable plus local patches as a tearoff, used
 +  only if the target system lacks an installed libevent 2.0.9 or later.
 +* Move blocking worker and resolver to libntp from ntpd.
 +* Use threads rather than forked child processes for blocking worker
 +  when possible.  Override with configure --disable-thread-support.
 +* Move init_logging(), change_logfile(), and setup_logfile() from ntpd
 +  to libntp, use them in sntp.
 +* Test --without-sntp in flock-build script's -no-refclocks variety.
 +* Avoid invoking config.status twice in a row in build script.
 +* Move more m4sh tests needed by libntp to shared .m4 files.
 +* Split up ntp_libntp.m4 into smaller, more specific subsets.
 +* Enable gcc -Wcast-align, fix many instances of warnings when casting
 +  a pointer to a more-strictly-aligned underlying type.
  (4.2.7p130) 2011/02/12 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1811] Update the download location in WHERE-TO-START.
  (4.2.7p129) 2011/02/09 Released by Harlan Stenn <stenn@ntp.org>

diff --cc ntpd/refclock_as2201.c
Simple merge