Skip to content

Commit 3007a73

Browse files
authored
Merge pull request #37 from Unity-Technologies/jyuill/external_platform
Add support for external (NDA) platforms
2 parents 0d55593 + 21f248c commit 3007a73

3 files changed

Lines changed: 16 additions & 2 deletions

File tree

lib/curl_setup.h

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,10 @@
130130

131131
#else /* HAVE_CONFIG_H */
132132

133+
#if defined(CURL_EXTERNAL_PLATFORM)
134+
# include "config-external.h"
135+
#endif
136+
133137
#ifdef _WIN32_WCE
134138
# include "config-win32ce.h"
135139
#else
@@ -319,6 +323,14 @@
319323
/* point. */
320324
/* ================================================================ */
321325

326+
/*
327+
* For platforms defined outside repo.
328+
*/
329+
330+
#if defined(CURL_EXTERNAL_PLATFORM)
331+
# include "setup-external.h"
332+
#endif
333+
322334
/*
323335
* OS/400 setup file includes some system headers.
324336
*/

lib/select.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,8 @@ int Curl_wait_ms(timediff_t timeout_ms);
111111
} while(0)
112112
#endif
113113

114+
struct easy_pollset;
115+
114116
struct curl_pollfds {
115117
struct pollfd *pfds;
116118
unsigned int n;

lib/vtls/unitytls_interface.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ typedef size_t (*unitytls_tlsctx_write_callback)(void* userData, const UInt8* da
206206
/* Called when unitytls expects incoming data. Should return the number of bytes it received or set an error on errorState. */
207207
typedef size_t (*unitytls_tlsctx_read_callback)(void* userData, UInt8* buffer, size_t bufferLen, unitytls_errorstate* errorState);
208208
/* Called with human readable string to trace the handshake process */
209-
typedef void (*unitytls_tlsctx_trace_callback)(void* userData, unitytls_tlsctx* ctx, const char* traceMessage, size_t traceMessageLen);
209+
typedef void (*unitytls_tlsctx_trace_callback)(void* userData, unitytls_tlsctx* ctx, int level, const char* fileName, size_t lineNumber, const char* traceMessage);
210210
/* Called during a handshake operation, check currentState to determine how to react. */
211211
typedef void (*unitytls_tlsctx_handshake_callback)(void* userData, unitytls_tlsctx* ctx, unitytls_tlsctx_handshakestate currentState, unitytls_errorstate* errorState);
212212
/* Called during a handshake operation. Client: if server issues a certificate request (client auth), Server: certificate SNI selection. */
@@ -265,7 +265,7 @@ typedef size_t (*unitytls_tlsctx_write_t)(unitytls_tlsctx*
265265
typedef void (*unitytls_tlsctx_notify_close_t)(unitytls_tlsctx* ctx, unitytls_errorstate* errorState);
266266
typedef void (*unitytls_tlsctx_free_t)(unitytls_tlsctx* ctx);
267267

268-
typedef void (*unitytls_tlsctx_set_certificate_callback_t)(unitytls_tlsctx* ctx, unitytls_tlsctx_certificate_callback cb, void* userData, unitytls_errorstate* errorState);
268+
269269

270270
typedef void (*unitytls_random_generate_bytes_t)(UInt8* buffer, size_t bufferLen, unitytls_errorstate* errorState);
271271

0 commit comments

Comments
 (0)