From: Dave Hart <hart@ntp.org>
Date: Thu, 7 May 2009 05:58:42 +0000 (+0000)
Subject: refclock_jjy.c merge from stable cleanup
X-Git-Tag: NTP_4_2_5P173~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=428c954c7cc2a10f42a0af4b8bfd6692dff291fd;p=thirdparty%2Fntp.git

refclock_jjy.c merge from stable cleanup

bk: 4a027892HHYMCNkm6OlkpZH9uyEgQw
---

diff --git a/ntpd/refclock_jjy.c b/ntpd/refclock_jjy.c
index 195e03365..a421e000e 100644
--- a/ntpd/refclock_jjy.c
+++ b/ntpd/refclock_jjy.c
@@ -193,6 +193,7 @@ static	void	jjy_poll                    (int, struct peer *);
 static	void	jjy_poll_tristate_jjy01     (int, struct peer *);
 static	void	jjy_poll_cdex_jst2000       (int, struct peer *);
 static	void	jjy_poll_echokeisokuki_lt2000    (int, struct peer *);
+static  void    jjy_poll_citizentic_jjy200          (int, struct peer *);
 static	void	jjy_receive                 (struct recvbuf *);
 static	int 	jjy_receive_tristate_jjy01  (struct recvbuf *);
 static	int 	jjy_receive_cdex_jst2000    (struct recvbuf *);
diff --git a/ports/winnt/ntp.sln b/ports/winnt/ntp.sln
index 732ecb4c1..36166cf71 100644
--- a/ports/winnt/ntp.sln
+++ b/ports/winnt/ntp.sln
@@ -1,15 +1,15 @@
 
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual C++ Express 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "instsrv", "instsrv\instsrv.vcproj", "{C3534C4D-6DF1-498E-9904-4337878A1515}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libntp", "libntp\libntp.vcproj", "{400FBFCB-462E-40D0-B06B-3B74E3FFFD00}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ntpd", "ntpd\ntpd.vcproj", "{CB61F8BF-9637-495C-9087-E8664B400CE0}"
 	ProjectSection(ProjectDependencies) = postProject
 		{400FBFCB-462E-40D0-B06B-3B74E3FFFD00} = {400FBFCB-462E-40D0-B06B-3B74E3FFFD00}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "instsrv", "instsrv\instsrv.vcproj", "{C3534C4D-6DF1-498E-9904-4337878A1515}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libntp", "libntp\libntp.vcproj", "{400FBFCB-462E-40D0-B06B-3B74E3FFFD00}"
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ntpdate", "ntpdate\ntpdate.vcproj", "{2789A62E-3F46-44F1-AAF0-816CD23C2911}"
 	ProjectSection(ProjectDependencies) = postProject
 		{400FBFCB-462E-40D0-B06B-3B74E3FFFD00} = {400FBFCB-462E-40D0-B06B-3B74E3FFFD00}
diff --git a/ports/winnt/ntpd/ntpd.vcproj b/ports/winnt/ntpd/ntpd.vcproj
index 88f11190f..a737569e2 100644
--- a/ports/winnt/ntpd/ntpd.vcproj
+++ b/ports/winnt/ntpd/ntpd.vcproj
@@ -1463,6 +1463,10 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="..\..\..\ntpd\refclock_jjy.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\ntpd\refclock_jupiter.c"
 				>