aboutsummaryrefslogtreecommitdiff
path: root/ports
diff options
context:
space:
mode:
Diffstat (limited to 'ports')
-rw-r--r--ports/winnt/include/msvc_ssl_autolib.h32
-rw-r--r--ports/winnt/instsrv/instsrv.c2
-rw-r--r--ports/winnt/ntpd/nt_ppsimpl.c5
-rw-r--r--ports/winnt/ntpd/ntp_iocompletionport.c2
-rwxr-xr-xports/winnt/scripts/mkver.bat12
-rw-r--r--ports/winnt/vs2008/debug-x64.vsprops2
-rw-r--r--ports/winnt/vs2008/debug.vsprops2
-rw-r--r--ports/winnt/vs2008/release-x64.vsprops2
-rw-r--r--ports/winnt/vs2008/release.vsprops2
-rw-r--r--ports/winnt/vs2013/debug-x64.props2
-rw-r--r--ports/winnt/vs2013/debug.props2
-rw-r--r--ports/winnt/vs2013/release-x64.props2
-rw-r--r--ports/winnt/vs2013/release.props2
-rw-r--r--ports/winnt/vs2015/debug-x64.props2
-rw-r--r--ports/winnt/vs2015/debug.props2
-rw-r--r--ports/winnt/vs2015/release-x64.props2
-rw-r--r--ports/winnt/vs2015/release.props2
17 files changed, 51 insertions, 26 deletions
diff --git a/ports/winnt/include/msvc_ssl_autolib.h b/ports/winnt/include/msvc_ssl_autolib.h
index 688b5e262007..9a8ae6126c1a 100644
--- a/ports/winnt/include/msvc_ssl_autolib.h
+++ b/ports/winnt/include/msvc_ssl_autolib.h
@@ -14,13 +14,13 @@
* So instead of manipulating the build environment we use the build
* tools themselves to create requests for linking the right library.
*
- * To use this feature, it is recommended to use the precompiled
- * VC binaries from Shining Light Productions:
+ * Unless you compile OpenSSL on your own, using the precompiled
+ * VC binaries from Shining Light Productions is probably easiest:
* https://slproweb.com/products/Win32OpenSSL.html
- * These are installed in (OPENSSL_LIB)/vc.
*
- * As an alternative, create the set of build variants of OpenSSL you
- * need, implementing the following naming scheme:
+ * If 'OPENSSL_AUTOLINK_STRICT' is defined, then target bit width,
+ * runtime model and debug/release info are incoded into the library
+ * file name, according to this scheme:
*
* basename<width><RT><DebRel>.lib
*
@@ -32,11 +32,16 @@
#pragma once
#if !defined(_MSC_VER)
+
# error use this header only with Micro$oft Visual C compilers!
+
#elif defined(OPENSSL_NO_AUTOLINK)
+
# pragma message("automatic OpenSSL library selection disabled")
-#else
-/* ---------------------------------------------------------------- */
+
+#elif defined(OPENSSL_AUTOLINK_STRICT)
+
+ /* ---------------------------------------------------------------- */
/* selection dance to get the right libraries linked */
/* ---------------------------------------------------------------- */
@@ -85,10 +90,19 @@
* request in the object file, depending on the SSL version and the
* build variant.
*/
+
+# if OPENSSL_VERSION_NUMBER >= 0x10100000L
+# pragma comment(lib, "libcrypto" LTAG_SIZE LTAG_RTLIB LTAG_DEBUG ".lib")
+# else
+# pragma comment(lib, "libeay32" LTAG_RTLIB LTAG_DEBUG ".lib")
+# endif
+
+# else
+
# if OPENSSL_VERSION_NUMBER >= 0x10100000L
-# pragma comment(lib, "libcrypto" LTAG_SIZE LTAG_RTLIB LTAG_DEBUG ".lib")
+# pragma comment(lib, "libcrypto.lib")
# else
-# pragma comment(lib, "libeay32" LTAG_RTLIB LTAG_DEBUG ".lib")
+# pragma comment(lib, "libeay32.lib")
# endif
#endif /*!defined(OPENSSL_NO_AUTOLINK)*/
diff --git a/ports/winnt/instsrv/instsrv.c b/ports/winnt/instsrv/instsrv.c
index d510d7060bd5..2a551aaed750 100644
--- a/ports/winnt/instsrv/instsrv.c
+++ b/ports/winnt/instsrv/instsrv.c
@@ -299,7 +299,7 @@ addSourceToRegistry(
to the new subkey.
*/
- rc = snprintf(regarray, sizeof(regarray), "%s%s",
+ rc = _snprintf(regarray, sizeof(regarray), "%s%s",
"SYSTEM\\CurrentControlSet\\Services\\EventLog\\Application\\",
pszAppname);
if (rc < 0 || rc >= sizeof(regarray)) {
diff --git a/ports/winnt/ntpd/nt_ppsimpl.c b/ports/winnt/ntpd/nt_ppsimpl.c
index 2a7c0d88f1d9..1ed3634cd5de 100644
--- a/ports/winnt/ntpd/nt_ppsimpl.c
+++ b/ports/winnt/ntpd/nt_ppsimpl.c
@@ -359,8 +359,9 @@ regfail:
*op++ = *cp;
}
}
- cp[0] = '\0';
- cp[1] = '\0';
+
+ *op++ = '\0';
+ *op = '\0';
return s_Value;
envfail:
diff --git a/ports/winnt/ntpd/ntp_iocompletionport.c b/ports/winnt/ntpd/ntp_iocompletionport.c
index 333bd2fb46c4..c5db62a8dd5f 100644
--- a/ports/winnt/ntpd/ntp_iocompletionport.c
+++ b/ports/winnt/ntpd/ntp_iocompletionport.c
@@ -643,7 +643,7 @@ socketErrorCheck(
case ERROR_HOST_UNREACHABLE:
oval = 0;
olen = sizeof(oval);
- getsockopt(ctx->io.sfd, SOL_SOCKET, SO_ERROR, (char*)&oval, &olen);
+ getsockopt(ctx->io.sfd, SOL_SOCKET, SO_ERROR, (void *)&oval, &olen);
retCode = PKT_DROP;
break;
diff --git a/ports/winnt/scripts/mkver.bat b/ports/winnt/scripts/mkver.bat
index 7b448299607d..4b0dcb8e6657 100755
--- a/ports/winnt/scripts/mkver.bat
+++ b/ports/winnt/scripts/mkver.bat
@@ -20,7 +20,14 @@ see notes/remarks directly below this header:
#
#
# Changes:
-# 02/23/2011 David J Taylor - Use reg instead of regedit so "run as
+# 03/03/2017 Brian Inglis
+# - ensure Windows system32 from COMSPEC added to start
+# of PATH in case other find commands are on PATH
+# 02/20/2017 Brian Inglis
+# - add support for Windows 10 (Home maybe others) rename of
+# registry Time Zone info from ActiveTimeBias to Bias
+# 02/23/2011 David J Taylor
+# - Use reg instead of regedit so "run as
# administrator" is not required.
# 12/21/2009 Dave Hart
# - packageinfo.sh uses prerelease= now not
@@ -82,6 +89,7 @@ GOTO USAGE
:BEGIN
+SET PATH=%COMSPEC:\cmd.exe=%;%PATH%
SET GENERATED_PROGRAM=%2
REM *****************************************************************************************************************
@@ -142,6 +150,8 @@ REM ****************************************************************************
IF NOT EXIST %TEMP%\TZ-%GENERATED_PROGRAM%.TMP GOTO NOTZINFO
for /f "Tokens=1* Delims==" %%a in ('type %TEMP%\TZ-%GENERATED_PROGRAM%.TMP') do if %%a == "ActiveTimeBias" SET ACTIVEBIAS=%%b
+ REM Windows 10 - Home and possibly others
+ IF "%ACTIVEBIAS%" == "" for /f "Tokens=1* Delims==" %%a in ('type %TEMP%\TZ-%GENERATED_PROGRAM%.TMP') do if %%a == "Bias" SET ACTIVEBIAS=%%b
for /f "Tokens=1* Delims=:" %%a in ('echo %ACTIVEBIAS%') do ( SET ACTIVEBIAS=%%b & SET PARTYP=%%a )
REM *** Clean up temporary file
diff --git a/ports/winnt/vs2008/debug-x64.vsprops b/ports/winnt/vs2008/debug-x64.vsprops
index 3f241c2c8692..36da166ea61f 100644
--- a/ports/winnt/vs2008/debug-x64.vsprops
+++ b/ports/winnt/vs2008/debug-x64.vsprops
@@ -14,7 +14,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalLibraryDirectories=" $(OPENSSL64_LIB)\vc"
+ AdditionalLibraryDirectories=" $(OPENSSL64_LIB)"
TargetMachine="17"
/>
</VisualStudioPropertySheet>
diff --git a/ports/winnt/vs2008/debug.vsprops b/ports/winnt/vs2008/debug.vsprops
index 0cbd9f4ae792..2d3119e3e60b 100644
--- a/ports/winnt/vs2008/debug.vsprops
+++ b/ports/winnt/vs2008/debug.vsprops
@@ -14,7 +14,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalLibraryDirectories=" $(OPENSSL_LIB)\vc"
+ AdditionalLibraryDirectories=" $(OPENSSL_LIB)"
TargetMachine="1"
/>
</VisualStudioPropertySheet>
diff --git a/ports/winnt/vs2008/release-x64.vsprops b/ports/winnt/vs2008/release-x64.vsprops
index 8c0ee80b0be4..7639fbc7da42 100644
--- a/ports/winnt/vs2008/release-x64.vsprops
+++ b/ports/winnt/vs2008/release-x64.vsprops
@@ -15,7 +15,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalLibraryDirectories=" $(OPENSSL64_LIB)\vc"
+ AdditionalLibraryDirectories=" $(OPENSSL64_LIB)"
TargetMachine="17"
/>
</VisualStudioPropertySheet>
diff --git a/ports/winnt/vs2008/release.vsprops b/ports/winnt/vs2008/release.vsprops
index 498779578f85..25c93f4c48be 100644
--- a/ports/winnt/vs2008/release.vsprops
+++ b/ports/winnt/vs2008/release.vsprops
@@ -15,7 +15,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalLibraryDirectories=" $(OPENSSL_LIB)\vc"
+ AdditionalLibraryDirectories=" $(OPENSSL_LIB)"
TargetMachine="1"
/>
</VisualStudioPropertySheet>
diff --git a/ports/winnt/vs2013/debug-x64.props b/ports/winnt/vs2013/debug-x64.props
index 65d4f863f42a..1d3d52d9c0c4 100644
--- a/ports/winnt/vs2013/debug-x64.props
+++ b/ports/winnt/vs2013/debug-x64.props
@@ -17,7 +17,7 @@
</ClCompile>
<Link>
<TargetMachine>MachineX64</TargetMachine>
- <AdditionalLibraryDirectories>$(OPENSSL64_LIB)\vc</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(OPENSSL64_LIB)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemGroup />
diff --git a/ports/winnt/vs2013/debug.props b/ports/winnt/vs2013/debug.props
index 46792f84587f..e82b7e896b3a 100644
--- a/ports/winnt/vs2013/debug.props
+++ b/ports/winnt/vs2013/debug.props
@@ -17,7 +17,7 @@
</ClCompile>
<Link>
<TargetMachine>MachineX86</TargetMachine>
- <AdditionalLibraryDirectories>$(OPENSSL_LIB)\vc</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(OPENSSL_LIB)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemGroup />
diff --git a/ports/winnt/vs2013/release-x64.props b/ports/winnt/vs2013/release-x64.props
index 2bb07cb37d3d..0122b1ee226a 100644
--- a/ports/winnt/vs2013/release-x64.props
+++ b/ports/winnt/vs2013/release-x64.props
@@ -18,7 +18,7 @@
</ClCompile>
<Link>
<TargetMachine>MachineX64</TargetMachine>
- <AdditionalLibraryDirectories>$(OPENSSL64_LIB)\vc</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(OPENSSL64_LIB)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemGroup />
diff --git a/ports/winnt/vs2013/release.props b/ports/winnt/vs2013/release.props
index f6382dfbac38..0e8e2babd437 100644
--- a/ports/winnt/vs2013/release.props
+++ b/ports/winnt/vs2013/release.props
@@ -18,7 +18,7 @@
</ClCompile>
<Link>
<TargetMachine>MachineX86</TargetMachine>
- <AdditionalLibraryDirectories>$(OPENSSL_LIB)\vc</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(OPENSSL_LIB)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemGroup />
diff --git a/ports/winnt/vs2015/debug-x64.props b/ports/winnt/vs2015/debug-x64.props
index 65d4f863f42a..1d3d52d9c0c4 100644
--- a/ports/winnt/vs2015/debug-x64.props
+++ b/ports/winnt/vs2015/debug-x64.props
@@ -17,7 +17,7 @@
</ClCompile>
<Link>
<TargetMachine>MachineX64</TargetMachine>
- <AdditionalLibraryDirectories>$(OPENSSL64_LIB)\vc</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(OPENSSL64_LIB)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemGroup />
diff --git a/ports/winnt/vs2015/debug.props b/ports/winnt/vs2015/debug.props
index 46792f84587f..e82b7e896b3a 100644
--- a/ports/winnt/vs2015/debug.props
+++ b/ports/winnt/vs2015/debug.props
@@ -17,7 +17,7 @@
</ClCompile>
<Link>
<TargetMachine>MachineX86</TargetMachine>
- <AdditionalLibraryDirectories>$(OPENSSL_LIB)\vc</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(OPENSSL_LIB)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemGroup />
diff --git a/ports/winnt/vs2015/release-x64.props b/ports/winnt/vs2015/release-x64.props
index 2bb07cb37d3d..0122b1ee226a 100644
--- a/ports/winnt/vs2015/release-x64.props
+++ b/ports/winnt/vs2015/release-x64.props
@@ -18,7 +18,7 @@
</ClCompile>
<Link>
<TargetMachine>MachineX64</TargetMachine>
- <AdditionalLibraryDirectories>$(OPENSSL64_LIB)\vc</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(OPENSSL64_LIB)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemGroup />
diff --git a/ports/winnt/vs2015/release.props b/ports/winnt/vs2015/release.props
index f6382dfbac38..0e8e2babd437 100644
--- a/ports/winnt/vs2015/release.props
+++ b/ports/winnt/vs2015/release.props
@@ -18,7 +18,7 @@
</ClCompile>
<Link>
<TargetMachine>MachineX86</TargetMachine>
- <AdditionalLibraryDirectories>$(OPENSSL_LIB)\vc</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(OPENSSL_LIB)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemGroup />
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-01 18:25:07 +0000