From: Dave Hart <hart@ntp.org>
Date: Sun, 6 Mar 2011 01:24:22 +0000 (+0000)
Subject: Add overlooked ChangeLog entry for last cset.
X-Git-Tag: NTP_4_2_7P137~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc4b8740d350aaf5c0a869d13326499b18fae799;p=thirdparty%2Fntp.git

Add overlooked ChangeLog entry for last cset.

bk: 4d72e246kVwV3jhvaZucF1sKhypFkA
---

diff --git a/ChangeLog b/ChangeLog
index f169a32b2..88b19f462 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 * Use TRACE() instead of DPRINTF() for libntp and utilities, which
   use the "debug" variable regardless of #ifdef DEBUG.
+* Declare debug in libntp instead of each program.  Expose extern
+  declaration to utilities, libntp, and DEBUG ntpd.
 (4.2.7p136) 2011/03/02 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 1839] 4.2.7p135 still installs libevent ev*.h headers.
 (4.2.7p135) 2011/03/02 Released by Harlan Stenn <stenn@ntp.org>
diff --git a/include/declcond.h b/include/declcond.h
index e1c72ac42..751eff9d1 100644
--- a/include/declcond.h
+++ b/include/declcond.h
@@ -11,7 +11,11 @@
  * "debug".  The libntp and utilities variant always declares debug,
  * as it is used in those codebases even without DEBUG defined.
  */
+#ifndef DECLCOND_H
+#define DECLCOND_H
 
 /* #ifdef DEBUG */		/* uncommented in ntpd/declcond.h */
 extern int debug;
 /* #endif */			/* uncommented in ntpd/declcond.h */
+
+#endif	/* DECLCOND_H */
diff --git a/ntpd/declcond.h b/ntpd/declcond.h
index d712948ba..870e5a729 100644
--- a/ntpd/declcond.h
+++ b/ntpd/declcond.h
@@ -11,7 +11,11 @@
  * "debug".  The libntp and utilities variant always declares debug,
  * as it is used in those codebases even without DEBUG defined.
  */
+#ifndef DECLCOND_H
+#define DECLCOND_H
 
 #ifdef DEBUG			/* uncommented in ntpd/declcond.h */
 extern int debug;
 #endif				/* uncommented in ntpd/declcond.h */
+
+#endif	/* DECLCOND_H */