[Bug 3688] GCC 10 build errors in testsuite

bk: 5f87ee90K_nb1CVI1BXYeeADGBC1fA

diff --git a/ChangeLog b/ChangeLog
index eeceaa9f10cb57b56caf561eaab50a81ec861f63..0a54f2775f5aba58116234deb9a68647cf20154a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+---
+* [Bug 3688] GCC 10 build errors in testsuite <perlinger@ntp.org>
+
 ---
 (4.2.8p15) 2020/06/23 Released by Harlan Stenn <stenn@ntp.org>
 

diff --git a/sntp/log.c b/sntp/log.c
index db6614d027109fcf1e7cf0833f896633985dc253..29b2ab4f5a2220f9cd8abd8112dd6a9b1634213c 100644 (file)
--- a/sntp/log.c
+++ b/sntp/log.c
@@ -2,7 +2,9 @@
 
 #include "log.h"
 
+#ifndef LOG_PROGNAME_IS_EXTERN
 const char *progname;          /* for msyslog use too */
+#endif
 
 static int counter = 0;
 

diff --git a/sntp/tests/t-log.c b/sntp/tests/t-log.c
index 08d4b6c59b2f525e2da71a0cbf3fada9b119d4a6..68b0e12ed46e8a2044cfe3869814b84d294cad8f 100644 (file)
--- a/sntp/tests/t-log.c
+++ b/sntp/tests/t-log.c
@@ -3,7 +3,7 @@
 #include "ntp_types.h"
 
 
-//#include "log.h"
+#define LOG_PROGNAME_IS_EXTERN 1
 #include "log.c"
 
 void setUp(void);