[ntpsec commit] Move two ,acros into the OVERRIDE_ namespace.

[Eric S. Raymond]

Module:    ntpsec
Branch:    master
Commit:    0275a6c7c6e3f40cf5fd18130947dd46d0a06d28
Changeset: http://git.ntpsec.org/ntpsec/commit/?id=0275a6c7c6e3f40cf5fd18130947dd46d0a06d28

Author:    Eric S. Raymond <esr at thyrsus.com>
Date:      Wed Sep 30 15:30:04 2015 -0400

Move two ,acros into the OVERRIDE_ namespace.

---

 libntp/systime.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/libntp/systime.c b/libntp/systime.c
index b85e251..00a4607 100644
--- a/libntp/systime.c
+++ b/libntp/systime.c
@@ -508,10 +508,14 @@ step_systime(
 	 */
 	tvdiff = abs_tval(sub_tval(timetv, tvlast));
 	if (tvdiff.tv_sec > 0) {
-#ifndef OTIME_MSG
+#ifdef OVERRIDE_OTIME_MSG
+# define OTIME_MSG OVERRIDE_OTIME_MSG
+#else
 # define OTIME_MSG	"Old NTP time"
 #endif
-#ifndef NTIME_MSG
+#ifdef OVERRIDE_NTIME_MSG
+# define NTIME_MSG OVERRIDE_NTIME_MSG
+#else
 # define NTIME_MSG	"New NTP time"
 #endif
 		struct utmpx utx;
@@ -533,7 +537,7 @@ step_systime(
 		pututxline(&utx);
 		endutxent();
 
-		/* Not POSIX - gllibc extension */
+		/* Not POSIX - glibc extension */
 #ifdef HAVE_UPDWTMPX
 #define WTMPX_FILE "/var/log/wtmp"
 		/* WTMPX */