Merge psp-at1.ntp.org:/home/stenn/ntp-stable

into  psp-at1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-unity

bk: 5597a5cedUxROUH89zQ-QWgAOAEiLQ

diff --cc ChangeLog
index dcb240a2ce486c344dbc324b07745f39f343e549,664dbfc1cc999661ffad2bf23260371e50c8703f..150d438d1e5545ed37a9f425e52b55b3d6b9b31e
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -9,8 -9,8 +9,10 @@@
  * On some versions of HP-UX, inttypes.h does not include stdint.h.  H.Stenn.
  * top_srcdir can change based on ntp v. sntp.  Harlan Stenn.
  * sntp/tests/ function parameter list cleanup.  Damir Tomić.
 -* sntp/unity/unity_internals.h: handle *INTPTR_MAX on old Solaris.  Harlan Stenn.
 +* tests/libntp/ function parameter list cleanup.  Damir Tomić.
 +* tests/ntpd/ function parameter list cleanup.  Damir Tomić.
+ * sntp/unity/unity_config.h: handle stdint.h.  Harlan Stenn.
++* sntp/unity/unity_internals.h: handle *INTPTR_MAX on old Solaris.  H.Stenn.
  ---
  (4.2.8p3) 2015/06/29 Released by Harlan Stenn <stenn@ntp.org>