diff --git a/libs/sofia-sip/libsofia-sip-ua/msg/msg_tag.c b/libs/sofia-sip/libsofia-sip-ua/msg/msg_tag.c
index 8d1b1d5285..061cd5ef2a 100644
--- a/libs/sofia-sip/libsofia-sip-ua/msg/msg_tag.c
+++ b/libs/sofia-sip/libsofia-sip-ua/msg/msg_tag.c
@@ -53,7 +53,7 @@
 #ifndef _MSC_VER
 #define NONE ((void*)-1)
 #else
-#define NONE ((void*)(UINT_PTR)-1)
+#define NONE ((void*)(INT_PTR)-1)
 #endif
 
 int msghdrtag_snprintf(tagi_t const *t, char b[], size_t size)
diff --git a/libs/sofia-sip/libsofia-sip-ua/msg/sofia-sip/msg_header.h b/libs/sofia-sip/libsofia-sip-ua/msg/sofia-sip/msg_header.h
index f930b178e7..c633aa3632 100644
--- a/libs/sofia-sip/libsofia-sip-ua/msg/sofia-sip/msg_header.h
+++ b/libs/sofia-sip/libsofia-sip-ua/msg/sofia-sip/msg_header.h
@@ -303,7 +303,7 @@ enum {
 #ifndef _MSC_VER
 #define MSG_HEADER_NONE ((msg_header_t *)-1)
 #else
-#define MSG_HEADER_NONE ((msg_header_t *)(UINT_PTR)-1)
+#define MSG_HEADER_NONE ((msg_header_t *)(INT_PTR)-1)
 #endif
 
 SOFIA_END_DECLS
diff --git a/libs/sofia-sip/libsofia-sip-ua/nea/nea_server.c b/libs/sofia-sip/libsofia-sip-ua/nea/nea_server.c
index 2e5c482e73..a6c7d49ac6 100644
--- a/libs/sofia-sip/libsofia-sip-ua/nea/nea_server.c
+++ b/libs/sofia-sip/libsofia-sip-ua/nea/nea_server.c
@@ -44,7 +44,7 @@
 #ifndef _MSC_VER
 #define NONE ((void *)- 1)
 #else
-#define NONE ((void *)(UINT_PTR)- 1)
+#define NONE ((void *)(INT_PTR)- 1)
 #endif
 
 #define SU_ROOT_MAGIC_T      struct nea_server_s
diff --git a/libs/sofia-sip/libsofia-sip-ua/nta/nta.c b/libs/sofia-sip/libsofia-sip-ua/nta/nta.c
index d360041537..40ee1f8f85 100644
--- a/libs/sofia-sip/libsofia-sip-ua/nta/nta.c
+++ b/libs/sofia-sip/libsofia-sip-ua/nta/nta.c
@@ -107,7 +107,7 @@ static char const __func__[] = "nta";
 #ifndef _MSC_VER
 #define NONE ((void *)-1)
 #else
-#define NONE ((void *)(UINT_PTR)-1)
+#define NONE ((void *)(INT_PTR)-1)
 #endif
 /* ------------------------------------------------------------------------- */
 
diff --git a/libs/sofia-sip/libsofia-sip-ua/nua/nua_dialog.c b/libs/sofia-sip/libsofia-sip-ua/nua/nua_dialog.c
index cc4bcb2bef..b96b1f31c0 100644
--- a/libs/sofia-sip/libsofia-sip-ua/nua/nua_dialog.c
+++ b/libs/sofia-sip/libsofia-sip-ua/nua/nua_dialog.c
@@ -57,7 +57,7 @@
 #ifndef _MSC_VER
 #define NONE ((void *)-1)
 #else
-#define NONE ((void *)(UINT_PTR)-1)
+#define NONE ((void *)(INT_PTR)-1)
 #endif
 #endif
 
diff --git a/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.h b/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.h
index f39f9d4c1a..97c88582a3 100644
--- a/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.h
+++ b/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.h
@@ -86,7 +86,7 @@ typedef struct nua_ee_data {
 #ifndef _MSC_VER
 #define       NONE ((void *)-1)
 #else
-#define       NONE ((void *)(UINT_PTR)-1)
+#define       NONE ((void *)(INT_PTR)-1)
 #endif
 
 typedef struct register_usage nua_registration_t;
diff --git a/libs/sofia-sip/libsofia-sip-ua/sip/sofia-sip/sip.h b/libs/sofia-sip/libsofia-sip-ua/sip/sofia-sip/sip.h
index 3c38f3b4fb..37ae836598 100644
--- a/libs/sofia-sip/libsofia-sip-ua/sip/sofia-sip/sip.h
+++ b/libs/sofia-sip/libsofia-sip-ua/sip/sofia-sip/sip.h
@@ -84,7 +84,7 @@ typedef enum {
 #ifndef _MSC_VER
 #define SIP_NONE ((void const *)-1L)
 #else
-#define SIP_NONE ((void const *)(UINT_PTR)-1L)
+#define SIP_NONE ((void const *)(INT_PTR)-1L)
 #endif
 
 /** SIP protocol identifier @HIDE */
diff --git a/libs/sofia-sip/libsofia-sip-ua/soa/soa.c b/libs/sofia-sip/libsofia-sip-ua/soa/soa.c
index d1b7477fc0..7f272a8e6f 100644
--- a/libs/sofia-sip/libsofia-sip-ua/soa/soa.c
+++ b/libs/sofia-sip/libsofia-sip-ua/soa/soa.c
@@ -59,7 +59,7 @@
 #ifndef _MSC_VER
 #define NONE ((void *)-1)
 #else
-#define NONE ((void *)(UINT_PTR)-1)
+#define NONE ((void *)(INT_PTR)-1)
 #endif
 #define XXX assert(!"implemented")
 
diff --git a/libs/sofia-sip/libsofia-sip-ua/soa/soa_static.c b/libs/sofia-sip/libsofia-sip-ua/soa/soa_static.c
index 2c870b28ad..f104274ef4 100644
--- a/libs/sofia-sip/libsofia-sip-ua/soa/soa_static.c
+++ b/libs/sofia-sip/libsofia-sip-ua/soa/soa_static.c
@@ -399,7 +399,7 @@ sdp_rtpmap_t *soa_sdp_media_matching_rtpmap(sdp_rtpmap_t const *from,
 #ifndef _MSC_VER
 #define SDP_MEDIA_NONE ((sdp_media_t *)-1)
 #else
-#define SDP_MEDIA_NONE ((sdp_media_t *)(UINT_PTR)-1)
+#define SDP_MEDIA_NONE ((sdp_media_t *)(INT_PTR)-1)
 #endif
 
 /** Find first matching media in table @a mm.
diff --git a/libs/sofia-sip/libsofia-sip-ua/tport/tport_internal.h b/libs/sofia-sip/libsofia-sip-ua/tport/tport_internal.h
index a26d38a552..683b79a360 100644
--- a/libs/sofia-sip/libsofia-sip-ua/tport/tport_internal.h
+++ b/libs/sofia-sip/libsofia-sip-ua/tport/tport_internal.h
@@ -82,7 +82,7 @@
 #ifndef _MSC_VER
 #define NONE ((void *)-1)
 #else
-#define NONE ((void *)(UINT_PTR)-1)
+#define NONE ((void *)(INT_PTR)-1)
 #endif
 #endif