From 38867a2f099b8cf35bfdf8de7507524d8ec1222c Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 10 Apr 2014 12:14:37 -0700 Subject: [PATCH] fix for re-declarations of xgnutls_free --- libraries/networking/src/DTLSSession.cpp | 4 ++++ libraries/networking/src/DTLSSession.h | 4 +--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/libraries/networking/src/DTLSSession.cpp b/libraries/networking/src/DTLSSession.cpp index 7d375ec327..addfd7b09a 100644 --- a/libraries/networking/src/DTLSSession.cpp +++ b/libraries/networking/src/DTLSSession.cpp @@ -14,6 +14,10 @@ #include "NodeList.h" #include "DTLSSession.h" +void xgnutls_free(void* gnutlsPtr){ + gnutls_free(gnutlsPtr); +} + int DTLSSession::socketPullTimeout(gnutls_transport_ptr_t ptr, unsigned int ms) { DTLSSession* session = static_cast(ptr); QUdpSocket& dtlsSocket = session->_dtlsSocket; diff --git a/libraries/networking/src/DTLSSession.h b/libraries/networking/src/DTLSSession.h index e379e20a2d..0db791c8f8 100644 --- a/libraries/networking/src/DTLSSession.h +++ b/libraries/networking/src/DTLSSession.h @@ -28,9 +28,7 @@ typedef void (*gnutls_free_function) (void *); __declspec(dllimport) extern gnutls_free_function gnutls_free; #endif -void xgnutls_free(void* gnutlsPtr){ - gnutls_free(gnutlsPtr); -} +void xgnutls_free(void* gnutlsPtr); class DTLSSession : public DummyDTLSSession { Q_OBJECT