From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 29 Dec 2014 08:47:40 +0000 (+0000)
Subject: [Bug 2695] 4.2.8 does not build on Windows
X-Git-Tag: NTP_4_2_8P1_BETA3~3^2~1^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6054d1a4c0aa027a42a5d34cd34b2b57ee4b149;p=thirdparty%2Fntp.git

[Bug 2695] 4.2.8 does not build on Windows

bk: 54a1152c4srU5dbaZwEex0na64lSUA
---

diff --git a/ChangeLog b/ChangeLog
index a405f29e2..85dd70865 100644
--- 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 b99aaa7ee..4b531c7a2 100644
--- 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 6bf25cbfa..354a8ac64 100644
--- 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 d3b1b6e3c..2e20c71b4 100644
--- 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" />