Add overlooked ChangeLog entry for last cset.

bk: 4d72e246kVwV3jhvaZucF1sKhypFkA

diff --git a/ChangeLog b/ChangeLog
index f169a32b2cba4c1995cc23c2cd137f36a39340a9..88b19f462d223f1082c3ddcbddfd72f4ec1cb40d 100644 (file)
--- 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 e1c72ac42776ed2439c49b88fe3ca26fb2cd6cd4..751eff9d167c74b31d743705ef683bb9f58a5777 100644 (file)
--- 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 d712948ba358cb4def1008701694bdc09370f28a..870e5a729b5d2002838a933444e4b7f71d177412 100644 (file)
--- 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 */