[Bug 3688] GCC 10 build errors in testsuite

 - fix the real issue -- 'progname' defined in wrong file

bk: 5f88950canMkp2sAppb4N3StOQWR2A

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

diff --git a/sntp/main.c b/sntp/main.c
index 8a4a2e562bb4b8c0d9300f6c98246737be725b95..69de299a709fc25a3a05795e428157a4e3b00b9d 100644 (file)
--- a/sntp/main.c
+++ b/sntp/main.c
@@ -20,6 +20,7 @@
 #include "log.h"
 #include "libntp.h"
 
+const char * progname;
 
 int shutting_down;
 int time_derived;

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