Changeset 537d9b9 for lib/ssl_gnutls.c

Timestamp:

2016-11-20T08:40:36Z (8 years ago)

Author:

dequis <dx@…>

Children:

3f44e43

Parents:

ba52ac5 (diff), 9f03c47 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge master up to commit '9f03c47' into parson

File:

• lib/ssl_gnutls.c (modified) (2 diffs)

lib/ssl_gnutls.c

@@ -42 +42 @@
 #include <limits.h>
 
-#if defined(ULONG_MAX) && ULONG_MAX > 4294967295UL
-#define GNUTLS_STUPID_CAST (long)
-#else
-#define GNUTLS_STUPID_CAST (int)
-#endif
-
 #define SSLDEBUG 0
 
@@ -335 +329 @@
 
         sock_make_nonblocking(conn->fd);
-        gnutls_transport_set_ptr(conn->session, (gnutls_transport_ptr_t) GNUTLS_STUPID_CAST conn->fd);
+        gnutls_transport_set_ptr(conn->session, (gnutls_transport_ptr_t) (long) conn->fd);
 
         ssl_cache_resume(conn);