diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update index a528d9c447..241cdefa22 100644 --- a/libs/sofia-sip/.update +++ b/libs/sofia-sip/.update @@ -1 +1 @@ -Fri Oct 18 23:59:59 CDT 2013 +Mon Oct 21 20:11:13 CDT 2013 diff --git a/libs/sofia-sip/libsofia-sip-ua/tport/ws.h b/libs/sofia-sip/libsofia-sip-ua/tport/ws.h index 8c0a50733e..992998be48 100644 --- a/libs/sofia-sip/libsofia-sip-ua/tport/ws.h +++ b/libs/sofia-sip/libsofia-sip-ua/tport/ws.h @@ -13,7 +13,6 @@ #include #else #pragma warning(disable:4996) -#include #endif #include #include @@ -27,7 +26,14 @@ #include #ifdef _MSC_VER -typedef intptr_t ssize_t; +#ifdef _WIN64 +#define WS_SSIZE_T __int64 +#elif _MSC_VER >= 1400 +#define WS_SSIZE_T __int32 __w64 +#else +#define WS_SSIZE_T __int32 +#endif +typedef WS_SSIZE_T ssize_t #endif @@ -90,10 +96,11 @@ ssize_t ws_close(wsh_t *wsh, int16_t reason); void ws_destroy(wsh_t *wsh); void init_ssl(void); void deinit_ssl(void); - int xp_errno(void); int xp_is_blocking(int errcode); + + #ifndef _MSC_VER static inline uint64_t get_unaligned_uint64(const void *p) {