From: Viktor Szakats <commit@vsz.me>
Date: Wed, 15 Nov 2023 22:31:44 +0000 (+0000)
Subject: tidy-up: casing typos, delete unused Windows version aliases
X-Git-Tag: curl-8_5_0~82
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab50027ddf9358b03608c41eff7ba1a667399718;p=thirdparty%2Fcurl.git

tidy-up: casing typos, delete unused Windows version aliases

- cmake: fix casing of `UnixSockets` to match the rest of the codebase.

- curl-compilers.m4: fix casing in a comment.

- setup-win32: delete unused Windows version constant aliases.

Reviewed-by: Marcel Raad
Closes #12351
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 07f4352f0d..db138237aa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1542,7 +1542,7 @@ if(NOT CURL_DISABLE_INSTALL)
   set(_items)
   _add_if("SSL"           SSL_ENABLED)
   _add_if("IPv6"          ENABLE_IPV6)
-  _add_if("unixsockets"   USE_UNIX_SOCKETS)
+  _add_if("UnixSockets"   USE_UNIX_SOCKETS)
   _add_if("libz"          HAVE_LIBZ)
   _add_if("brotli"        HAVE_BROTLI)
   _add_if("zstd"          HAVE_ZSTD)
diff --git a/lib/setup-win32.h b/lib/setup-win32.h
index 5fe4b4c82b..4e034d4bb2 100644
--- a/lib/setup-win32.h
+++ b/lib/setup-win32.h
@@ -96,18 +96,12 @@
 #ifndef _WIN32_WINNT_WS03
 #define _WIN32_WINNT_WS03           0x0502   /* Windows Server 2003 */
 #endif
-#ifndef _WIN32_WINNT_WIN6
-#define _WIN32_WINNT_WIN6           0x0600   /* Windows Vista */
-#endif
 #ifndef _WIN32_WINNT_VISTA
 #define _WIN32_WINNT_VISTA          0x0600   /* Windows Vista */
 #endif
 #ifndef _WIN32_WINNT_WS08
 #define _WIN32_WINNT_WS08           0x0600   /* Windows Server 2008 */
 #endif
-#ifndef _WIN32_WINNT_LONGHORN
-#define _WIN32_WINNT_LONGHORN       0x0600   /* Windows Vista */
-#endif
 #ifndef _WIN32_WINNT_WIN7
 #define _WIN32_WINNT_WIN7           0x0601   /* Windows 7 */
 #endif
@@ -117,9 +111,6 @@
 #ifndef _WIN32_WINNT_WINBLUE
 #define _WIN32_WINNT_WINBLUE        0x0603   /* Windows 8.1 */
 #endif
-#ifndef _WIN32_WINNT_WINTHRESHOLD
-#define _WIN32_WINNT_WINTHRESHOLD   0x0A00   /* Windows 10 */
-#endif
 #ifndef _WIN32_WINNT_WIN10
 #define _WIN32_WINNT_WIN10          0x0A00   /* Windows 10 */
 #endif
diff --git a/m4/curl-compilers.m4 b/m4/curl-compilers.m4
index 6ad9ef2ac5..636c2fafb8 100644
--- a/m4/curl-compilers.m4
+++ b/m4/curl-compilers.m4
@@ -95,7 +95,7 @@ AC_DEFUN([CURL_CHECK_COMPILER_CLANG], [
     clangver=`echo $fullclangver | grep "based on LLVM " | "$SED" 's/.*(based on LLVM \(@<:@0-9@:>@*\.@<:@0-9@:>@*\).*)/\1/'`
     if test -z "$clangver"; then
       if echo $fullclangver | grep "Apple LLVM version " >/dev/null; then
-        dnl Starting with XCode 7 / clang 3.7, Apple clang won't tell its upstream version
+        dnl Starting with Xcode 7 / clang 3.7, Apple clang won't tell its upstream version
         clangver="3.7"
       else
         clangver=`echo $fullclangver | "$SED" 's/.*version \(@<:@0-9@:>@*\.@<:@0-9@:>@*\).*/\1/'`