fix warnings on windows x64 builds src and mods projects - only libsofia included on the libs side

2026-10-30 07:04:17 +00:00 · 2010-09-29 15:47:58 -05:00
1 parent 38e0bfb5a8
commit 45ecbc2f61
@@ -58,7 +58,11 @@ SOFIA_BEGIN_DECLS
 #define HTTP_DEFAULT_SERV "80"

 /** HTTP protocol identifier */
+#ifndef _MSC_VER
 #define HTTP_PROTOCOL_TAG   ((void *)0x48545450)	/* 'HTTP' */
+#else
+#define HTTP_PROTOCOL_TAG   ((void *)(UINT_PTR)0x48545450)	/* 'HTTP' */
+#endif

 /** HTTP parser flags */
 enum {
@@ -50,7 +50,11 @@
 #include <sofia-sip/su_tagarg.h>
 #include "sofia-sip/msg_tag_class.h"

+#ifndef _MSC_VER
 #define NONE ((void*)-1)
+#else
+#define NONE ((void*)(UINT_PTR)-1)
+#endif

 int msghdrtag_snprintf(tagi_t const *t, char b[], size_t size)
 {
@@ -299,7 +299,12 @@ enum {
   (h))

 /** No header. */
+
+#ifndef _MSC_VER
 #define MSG_HEADER_NONE ((msg_header_t *)-1)
+#else
+#define MSG_HEADER_NONE ((msg_header_t *)(UINT_PTR)-1)
+#endif

 SOFIA_END_DECLS

@@ -235,7 +235,11 @@ msg_content_length_t *msg_content_length_create(su_home_t *home, uint32_t n);
 SOFIAPUBVAR char const msg_mime_version_1_0[];

 /** MIME multipart parser table identifier. @HIDE */
+#ifndef _MSC_VER
 #define MSG_MULTIPART_PROTOCOL_TAG   ((void *)0x4d494d45)	/* 'MIME' */
+#else
+#define MSG_MULTIPART_PROTOCOL_TAG   ((void *)(UINT_PTR)0x4d494d45)	/* 'MIME' */
+#endif

 SOFIA_END_DECLS

@@ -41,7 +41,11 @@

 #include "nea_debug.h"

+#ifndef _MSC_VER
 #define NONE ((void *)- 1)
+#else
+#define NONE ((void *)(UINT_PTR)- 1)
+#endif

 #define SU_ROOT_MAGIC_T      struct nea_server_s
 #define SU_MSG_ARG_T         tagi_t
@@ -104,8 +104,11 @@ char const nta_version[] = PACKAGE_VERSION;
 static char const __func__[] = "nta";
 #endif

+#ifndef _MSC_VER
 #define NONE ((void *)-1)
-
+#else
+#define NONE ((void *)(UINT_PTR)-1)
+#endif
 /* ------------------------------------------------------------------------- */

 /** Resolving order */
@@ -53,7 +53,12 @@
 #include <sofia-sip/su_debug.h>

 #ifndef NONE
+
+#ifndef _MSC_VER
 #define NONE ((void *)-1)
+#else
+#define NONE ((void *)(UINT_PTR)-1)
+#endif
 #endif

 /* ======================================================================== */
@@ -83,7 +83,11 @@ typedef struct nua_ee_data {
  nua_event_data_t ee_data[1];
 } nua_ee_data_t;

+#ifndef _MSC_VER
 #define       NONE ((void *)-1)
+#else
+#define       NONE ((void *)(UINT_PTR)-1)
+#endif

 typedef struct register_usage nua_registration_t;

@@ -81,10 +81,18 @@ typedef enum {
 #define SIP_METHOD_PUBLISH    sip_method_publish, "PUBLISH"

 /** Magic pointer value - never valid for SIP headers. @HI */
+#ifndef _MSC_VER
 #define SIP_NONE ((void const *)-1L)
+#else
+#define SIP_NONE ((void const *)(UINT_PTR)-1L)
+#endif

 /** SIP protocol identifier @HIDE */
+#ifndef _MSC_VER
 #define SIP_PROTOCOL_TAG   ((void *)0x53495020)	/* 'SIP'20 */
+#else
+#define SIP_PROTOCOL_TAG   ((void *)(UINT_PTR)0x53495020)	/* 'SIP'20 */
+#endif

 enum {
  /** Default port for SIP as integer */
@@ -56,7 +56,11 @@
 #include <sofia-sip/su_string.h>
 #include <sofia-sip/su_errno.h>

+#ifndef _MSC_VER
 #define NONE ((void *)-1)
+#else
+#define NONE ((void *)(UINT_PTR)-1)
+#endif
 #define XXX assert(!"implemented")

 typedef unsigned longlong ull;
@@ -396,7 +396,11 @@ sdp_rtpmap_t *soa_sdp_media_matching_rtpmap(sdp_rtpmap_t const *from,
  return NULL;
 }

+#ifndef _MSC_VER
 #define SDP_MEDIA_NONE ((sdp_media_t *)-1)
+#else
+#define SDP_MEDIA_NONE ((sdp_media_t *)(UINT_PTR)-1)
+#endif

 /** Find first matching media in table @a mm.
 *
@@ -125,7 +125,7 @@ su_inline
 ssize_t sres_recvfrom(sres_socket_t s, void *buffer, size_t length, int flags,
 		      struct sockaddr *from, socklen_t *fromlen)
 {
-  int retval, ilen;
+  int retval, ilen = 0;

  if (fromlen)
    ilen = *fromlen;
@@ -434,7 +434,7 @@ ssize_t su_recv(su_socket_t s, void *buffer, size_t length, int flags)
 ssize_t su_recvfrom(su_socket_t s, void *buffer, size_t length, int flags,
 		    su_sockaddr_t *from, socklen_t *fromlen)
 {
-  int retval, ilen;
+  int retval, ilen = 0;

  if (fromlen)
    ilen = *fromlen;
@@ -79,7 +79,11 @@
 #endif

 #ifndef NONE
+#ifndef _MSC_VER
 #define NONE ((void *)-1)
+#else
+#define NONE ((void *)(UINT_PTR)-1)
+#endif
 #endif

 SOFIA_BEGIN_DECLS