[Bug 2695] 4.2.8 does not build on Windows

bk: 54a1152c4srU5dbaZwEex0na64lSUA

diff --git a/ChangeLog b/ChangeLog
index a405f29e2caf5e38e757c045fe564c2cc60fc60d..85dd70865c7405f3a0b4bd7885053fc4c7d80d48 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 ---
 
 * [Bug 2693] ntp-keygen doesn't build without OpenSSL and sntp.
+* [Bug 2695] 4.2.8 does not build on Windows.
 * [Bug 2709] see if we have a C99 compiler (not yet required).
 ---
 (4.2.8p1-beta1) 2014/12/23 Released by Harlan Stenn <stenn@ntp.org>

diff --git a/ports/winnt/include/config.h b/ports/winnt/include/config.h
index b99aaa7ee27f6b59dab4f078d86ae42f4fe21faf..4b531c7a2f47f0b18fb5196c4a15375c074eecf4 100644 (file)
--- a/ports/winnt/include/config.h
+++ b/ports/winnt/include/config.h
@@ -258,6 +258,7 @@ typedef int socklen_t;
 
 /* Enable OpenSSL */
 #define OPENSSL 1
+#define USE_OPENSSL_CRYPTO_RAND 1
 
 /*
  * Keywords and functions that Microsoft maps

diff --git a/ports/winnt/vs2008/libntp/libntp.vcproj b/ports/winnt/vs2008/libntp/libntp.vcproj
index 6bf25cbfa225b2e6b1153afa9ff240613501438c..354a8ac64db2f07c29d966ef6aa4e8a81bbe2277 100644 (file)
--- a/ports/winnt/vs2008/libntp/libntp.vcproj
+++ b/ports/winnt/vs2008/libntp/libntp.vcproj
@@ -400,6 +400,10 @@
                                RelativePath="..\..\..\..\libntp\ntp_calendar.c"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\..\..\libntp\ntp_crypto_rnd.c"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\..\..\libntp\ntp_intres.c"
                                >
@@ -870,11 +874,11 @@
                                >
                        </File>
                        <File
-                               RelativePath="..\..\..\..\lib\isc\win32\include\isc\time.h"
+                               RelativePath="..\..\include\sys\time.h"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\include\sys\time.h"
+                               RelativePath="..\..\..\..\lib\isc\win32\include\isc\time.h"
                                >
                        </File>
                        <File

diff --git a/ports/winnt/vs2013/libntp/libntp.vcxproj b/ports/winnt/vs2013/libntp/libntp.vcxproj
index d3b1b6e3c00a4cc9acc50825e88f95032def3cc7..2e20c71b4ce9eeaf8b74aba82d9ef21c8c7f0cdd 100644 (file)
--- a/ports/winnt/vs2013/libntp/libntp.vcxproj
+++ b/ports/winnt/vs2013/libntp/libntp.vcxproj
@@ -571,6 +571,7 @@
     <ClCompile Include="..\..\..\..\libntp\netof.c" />
     <ClCompile Include="..\..\..\..\lib\isc\netscope.c" />
     <ClCompile Include="..\..\..\..\libntp\ntp_calendar.c" />
+    <ClCompile Include="..\..\..\..\libntp\ntp_crypto_rnd.c" />
     <ClCompile Include="..\..\..\..\libntp\ntp_intres.c" />
     <ClCompile Include="..\..\..\..\libntp\ntp_libopts.c" />
     <ClCompile Include="..\..\..\..\libntp\ntp_lineedit.c" />