Unity test cleanup: move declaration of 'initializing'. Harlan Stenn.

bk: 55cda5b5DxdR2Ww2Er9ka9OQ8xXPqw

diff --git a/ChangeLog b/ChangeLog
index 02a5bfbf776d6b53664520b385194dbffa24d571..7f3b7ce07b0c80582f5bab0a59fcd85fbefdc19b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -107,6 +107,7 @@ fixed formatting. Tomasz Flendrich
 * Updated generate_test_runner.rb and updated the sntp/unity/auto directory
   with the latest Unity updates from Mark. Damir Tomić.
 * Retire google test - phase I.  Harlan Stenn.
+* Unity test cleanup: move declaration of 'initializing'.  Harlan Stenn.
 ---
 (4.2.8p3) 2015/06/29 Released by Harlan Stenn <stenn@ntp.org>
 

diff --git a/ntpd/ntp_timer.c b/ntpd/ntp_timer.c
index 5cbb892e3ddd2a3e638f4caa710272a1f7e5cd66..828aa8c273bfba3be8c8bab322e52cf7dd59c124 100644 (file)
--- a/ntpd/ntp_timer.c
+++ b/ntpd/ntp_timer.c
@@ -56,6 +56,12 @@ static void check_leapsec(u_int32, const time_t*, int/*BOOL*/);
  */
 volatile int interface_interval;     /* init_io() sets def. 300s */
 
+/*
+ * Initializing flag.  All async routines watch this and only do their
+ * thing when it is clear.
+ */
+int initializing;
+
 /*
  * Alarm flag. The mainline code imports this.
  */

diff --git a/ntpd/ntpd.c b/ntpd/ntpd.c
index 76628566524ba5c65a4d9448d48c875502e126fc..6c4fcc2e6839cbc0250042937b29513e3d9f5ff0 100644 (file)
--- a/ntpd/ntpd.c
+++ b/ntpd/ntpd.c
@@ -179,12 +179,6 @@ struct passwd *pw;
 int    waitsync_fd_to_close = -1;      /* -w/--wait-sync */
 #endif
 
-/*
- * Initializing flag.  All async routines watch this and only do their
- * thing when it is clear.
- */
-int initializing;
-
 /*
  * Version declaration
  */