refclock_jjy.c merge from stable cleanup

bk: 4a027892HHYMCNkm6OlkpZH9uyEgQw

diff --git a/ntpd/refclock_jjy.c b/ntpd/refclock_jjy.c
index 195e03365d47b55b9912d5d2f8a76021421122b3..a421e000eaf0acaed03bb7bc0c95cc446560c69f 100644 (file)
--- 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 732ecb4c1616c9559f0d28e2358ad16b29273cab..36166cf71fc71d49b0cb3c7420a158efd73d3b82 100644 (file)
--- 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 88f11190fb243d577872e5f4856ae15d47efed3c..a737569e26b7cbe657c0187556f34fe1c6476f98 100644 (file)
--- 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"
                                >