From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 4 Jul 2015 09:22:22 +0000 (+0000)
Subject: Merge psp-at1.ntp.org:/home/stenn/ntp-stable
X-Git-Tag: NTP_4_3_53~4^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e36002dddec5c98014bc4e628d21f9aebf6a971d;p=thirdparty%2Fntp.git

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
---

e36002dddec5c98014bc4e628d21f9aebf6a971d
diff --cc ChangeLog
index dcb240a2c,664dbfc1c..150d438d1
--- a/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ć.
 +* 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.  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>