Skip to content

Commit cff92f0

Browse files
committed
unitytls updates based on curl API changes
* vtls: replace "none"-functions with NULL pointers 2bf48b4 * lots of function pointers removed from Curl_ssl struct * adjust function prototypes to match changes in Curl_ssl struct
1 parent fe5ca88 commit cff92f0

12 files changed

Lines changed: 73 additions & 328 deletions

lib/config-android-arm32.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@
147147
#define HAVE_WRITEV 1
148148
#define HAVE_ZLIB_H 1
149149
#define LT_OBJDIR ".libs/"
150-
#define OS "arm-unknown-linux-gnu"
150+
#define CURL_OS "arm-unknown-linux-gnu"
151151
#define PACKAGE "curl"
152152
#define PACKAGE_BUGREPORT "a suitable curl mailing list: https://curl.se/mail/"
153153
#define PACKAGE_NAME "curl"

lib/config-android-arm64.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@
147147
#define HAVE_WRITEV 1
148148
#define HAVE_ZLIB_H 1
149149
#define LT_OBJDIR ".libs/"
150-
#define OS "aarch64-unknown-linux-gnu"
150+
#define CURL_OS "aarch64-unknown-linux-gnu"
151151
#define PACKAGE "curl"
152152
#define PACKAGE_BUGREPORT "a suitable curl mailing list: https://curl.se/mail/"
153153
#define PACKAGE_NAME "curl"

lib/config-android-x86.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@
147147
#define HAVE_WRITEV 1
148148
#define HAVE_ZLIB_H 1
149149
#define LT_OBJDIR ".libs/"
150-
#define OS "i686-pc-linux-gnu"
150+
#define CURL_OS "i686-pc-linux-gnu"
151151
#define PACKAGE "curl"
152152
#define PACKAGE_BUGREPORT "a suitable curl mailing list: https://curl.se/mail/"
153153
#define PACKAGE_NAME "curl"

lib/config-android-x86_64.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@
147147
#define HAVE_WRITEV 1
148148
#define HAVE_ZLIB_H 1
149149
#define LT_OBJDIR ".libs/"
150-
#define OS "x86_64-pc-linux-gnu"
150+
#define CURL_OS "x86_64-pc-linux-gnu"
151151
#define PACKAGE "curl"
152152
#define PACKAGE_BUGREPORT "a suitable curl mailing list: https://curl.se/mail/"
153153
#define PACKAGE_NAME "curl"

lib/config-linux.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -798,7 +798,7 @@
798798
#define NTLM_WB_FILE "/usr/bin/ntlm_auth"
799799

800800
/* cpu-machine-OS */
801-
#define OS "x86_64-pc-linux-gnu"
801+
#define CURL_OS "x86_64-pc-linux-gnu"
802802

803803
/* Name of package */
804804
#define PACKAGE "curl"

lib/config-macos.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@
140140
#define HAVE_WRITEV 1
141141
#define HAVE_ZLIB_H 1
142142
#define LT_OBJDIR ".libs/"
143-
#define OS "x86_64-apple-darwin21.6.0"
143+
#define CURL_OS "x86_64-apple-darwin21.6.0"
144144
#define PACKAGE "curl"
145145
#define PACKAGE_BUGREPORT "a suitable curl mailing list: https://curl.se/mail/"
146146
#define PACKAGE_NAME "curl"

lib/config-qnx.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -798,7 +798,7 @@
798798
#define NTLM_WB_FILE "/usr/bin/ntlm_auth"
799799

800800
/* cpu-machine-OS */
801-
#define OS "x86_64-pc-linux-gnu"
801+
#define CURL_OS "x86_64-pc-linux-gnu"
802802

803803
/* Name of package */
804804
#define PACKAGE "curl"

lib/curl_addrinfo.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,10 @@
4646

4747
#if defined(USE_UNIX_SOCKETS) && defined(WINAPI_FAMILY) && \
4848
((WINAPI_FAMILY == WINAPI_FAMILY_APP) || (WINAPI_FAMILY == WINAPI_FAMILY_GAMES) || (WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP))
49-
/* Required for sockaddr_un type */
50-
# if !defined(WIN32_SOCKADDR_UN)
49+
/* Required for sockaddr_un type — skip if curl_setup.h's local typedef
50+
already ran (it defines UNIX_PATH_MAX) or if afunix.h was pulled in
51+
earlier in the translation unit. */
52+
# if !defined(UNIX_PATH_MAX)
5153
# include <afunix.h>
5254
# endif
5355
#endif

lib/curl_setup.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,8 @@
149149
# include "config-win32ce.h"
150150
#else
151151
# ifdef _WIN32
152-
# include "config-win32.h"
152+
# include "config-win32.h"
153+
# endif
153154
#endif
154155

155156
#if defined(__MACH__)

lib/timeval.c

Lines changed: 0 additions & 241 deletions
This file was deleted.

0 commit comments

Comments
 (0)