From: Dave Hart <hart@ntp.org>
Date: Thu, 18 Aug 2011 02:25:11 +0000 (+0000)
Subject: [Bug 1992] util/tg2 doesn't compile, needs libntp.
X-Git-Tag: NTP_4_2_7P205~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=81d0fd5b7e6d31055c99bf1b621943cfcbe699a1;p=thirdparty%2Fntp.git

[Bug 1992] util/tg2 doesn't compile, needs libntp.
Patch supplied by  kukabu@gmail.com:
http://bugs.ntp.org/attachment.cgi?id=786

bk: 4e4c7807EaM2rIIvUGGaQBhokdRyKA
---

diff --git a/ChangeLog b/ChangeLog
index 9fc905652..949bfab79 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [Bug 1992] util/tg2 doesn't compile, needs libntp.
 (4.2.7p204) 2011/08/16 Released by Harlan Stenn <stenn@ntp.org>
 * Added support for Garmin's $PGRMF sentence to NMEA driver
 * [Bug 1988] Better sntp send failed error message needed.
diff --git a/util/Makefile.am b/util/Makefile.am
index 703614643..e3480aa92 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -15,7 +15,7 @@ AM_CPPFLAGS += $(CPPFLAGS_NTP)
 
 # LDADD might need RESLIB and ADJLIB
 LDADD=		../libntp/libntp.a $(LDADD_LIBNTP) $(PTHREAD_LIBS)
-tg2_LDADD=	$(LIBM)
+tg2_LDADD=	../libntp/libntp.a $(LIBM)
 ntp_keygen_LDADD  = version.o $(LIBOPTS_LDADD) ../libntp/libntp.a
 ntp_keygen_LDADD += $(LDADD_LIBNTP) $(PTHREAD_LIBS) $(LCRYPTO)
 ntp_keygen_SOURCES = ntp-keygen.c ntp-keygen-opts.c ntp-keygen-opts.h
diff --git a/util/tg2.c b/util/tg2.c
index e388f20f0..6d52ef4fb 100644
--- a/util/tg2.c
+++ b/util/tg2.c
@@ -218,6 +218,8 @@
 # endif
 #endif
 
+#include "ntp_stdlib.h"	/* for strlcat(), strlcpy() */
+
 #include <math.h>
 #include <errno.h>
 #include <sys/types.h>
@@ -248,9 +250,6 @@
 #define	M5		(5)				/* IRIG 1 pulse */
 #define	M8		(8)				/* IRIG PI pulse */
 
-#define	FALSE	(0)
-#define	TRUE	(1)
-
 #define	NUL		(0)
 
 #define	SECONDS_PER_MINUTE	(60)