Merge psp-deb1.ntp.org:/home/stenn/ntp-stable-unity

into  psp-deb1.ntp.org:/home/tflendrich/ntpd_tests/ntp-stable-unity

bk: 55b5500acEZbTqd2GN7vLCZ45-GYlw

diff --cc tests/libntp/socktoa.c
index bd584d347682e3d2e440a669f8a002ccf4cf9929,bd4e4286b5d6060b47f298b89c197d4a6e0263cb..9ce3a1e9946b732323e2ab53abb4e3075eb11e6b
--- 1/tests/libntp/socktoa.c
--- 2/tests/libntp/socktoa.c
+++ b/tests/libntp/socktoa.c
@@@ -4,11 -4,17 +4,17 @@@
  #include "ntp_calendar.h"
  
  #include "unity.h"
 -
  #include "sockaddrtest.h"
  
+ void test_IPv4AddressWithPort(void);
+ void test_IPv6AddressWithPort(void);
+ void test_ScopedIPv6AddressWithPort(void);
+ void test_HashEqual(void);
+ void test_HashNotEqual(void);
+ void test_IgnoreIPv6Fields(void);
  
 -void test_IPv4AddressWithPort(void) {
 +void 
 +test_IPv4AddressWithPort(void) {
        sockaddr_u input = CreateSockaddr4("192.0.2.10", 123);
  
        TEST_ASSERT_EQUAL_STRING("192.0.2.10", socktoa(&input));