Skip to content

Commit 53b76ce

Browse files
authored
libvncclient: tls_gnutls: Fix gnutls_transport_set_errno on Windows
gnutls_transport_set_errno takes a plain "gnutls_session_t", not a "gnutls_session_t *". This fixes build errors if building with a recent version of Clang targeting Windows: libvncserver/src/libvncclient/tls_gnutls.c:161:32: error: incompatible pointer types passing 'gnutls_session_t *' (aka 'struct gnutls_session_int **') to parameter of type 'gnutls_session_t' (aka 'struct gnutls_session_int *'); dereference with * [-Wincompatible-pointer-types] 161 | gnutls_transport_set_errno(session, EAGAIN); | ^~~~~~~ | * x86_64-w64-mingw32/include/gnutls/gnutls.h:2429:50: note: passing argument to parameter 'session' here 2429 | void gnutls_transport_set_errno(gnutls_session_t session, int err); | ^
1 parent a6f197e commit 53b76ce

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/libvncclient/tls_gnutls.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ InitializeTLS(void)
253253
* libvncclient are linked to different versions of msvcrt.dll.
254254
*/
255255
#ifdef WIN32
256-
static void WSAtoTLSErrno(gnutls_session_t* session)
256+
static void WSAtoTLSErrno(gnutls_session_t session)
257257
{
258258
switch(WSAGetLastError()) {
259259
#if (GNUTLS_VERSION_NUMBER >= 0x029901)
@@ -293,7 +293,7 @@ PushTLS(gnutls_transport_ptr_t transport, const void *data, size_t len)
293293
if (ret < 0)
294294
{
295295
#ifdef WIN32
296-
WSAtoTLSErrno((gnutls_session_t*)&client->tlsSession);
296+
WSAtoTLSErrno((gnutls_session_t)client->tlsSession);
297297
#endif
298298
if (errno == EINTR) continue;
299299
return -1;
@@ -315,7 +315,7 @@ PullTLS(gnutls_transport_ptr_t transport, void *data, size_t len)
315315
if (ret < 0)
316316
{
317317
#ifdef WIN32
318-
WSAtoTLSErrno((gnutls_session_t*)&client->tlsSession);
318+
WSAtoTLSErrno((gnutls_session_t)client->tlsSession);
319319
#endif
320320
if (errno == EINTR) continue;
321321
return -1;
@@ -337,7 +337,7 @@ PullTimeout(gnutls_transport_ptr_t transport, unsigned int timeout)
337337
if (ret < 0)
338338
{
339339
#ifdef WIN32
340-
WSAtoTLSErrno((gnutls_session_t*)&client->tlsSession);
340+
WSAtoTLSErrno((gnutls_session_t)client->tlsSession);
341341
#endif
342342
if (errno == EINTR) continue;
343343
}

0 commit comments

Comments
 (0)