From 3687892e91443d3642887e3dc3e578d67b678d1a Mon Sep 17 00:00:00 2001
From: Jeff Lenk <jeff@jefflenk.com>
Date: Sat, 21 Dec 2013 16:50:09 -0600
Subject: [PATCH] FS-6010 VS2013 build changes
---
libs/apr/atomic/win32/apr_atomic.c | 18 ++++++++++++++++++
libs/esl/src/esl_event.c | 2 +-
libs/ilbc/src/iLBC_decode.c | 2 ++
libs/libsndfile/src/float_cast.h | 2 ++
libs/sofia-sip/libsofia-sip-ua/sdp/sdp_parse.c | 4 +++-
libs/sofia-sip/libsofia-sip-ua/su/strtoull.c | 7 ++++++-
libs/sofia-sip/libsofia-sip-ua/su/su_taglist.c | 2 ++
7 files changed, 34 insertions(+), 3 deletions(-)
diff --git a/libs/apr/atomic/win32/apr_atomic.c b/libs/apr/atomic/win32/apr_atomic.c
index 9393fcb008..18a7bcd0ba 100644
--- a/libs/apr/atomic/win32/apr_atomic.c
+++ b/libs/apr/atomic/win32/apr_atomic.c
@@ -27,6 +27,7 @@ APR_DECLARE(apr_status_t) apr_atomic_init(apr_pool_t *p)
* Remapping function pointer type to accept apr_uint32_t's type-safely
* as the arguments for as our apr_atomic_foo32 Functions
*/
+#if (_MSC_VER < 1800)
typedef WINBASEAPI apr_uint32_t (WINAPI * apr_atomic_win32_ptr_fn)
(apr_uint32_t volatile *);
typedef WINBASEAPI apr_uint32_t (WINAPI * apr_atomic_win32_ptr_val_fn)
@@ -38,11 +39,14 @@ typedef WINBASEAPI apr_uint32_t (WINAPI * apr_atomic_win32_ptr_val_val_fn)
typedef WINBASEAPI void * (WINAPI * apr_atomic_win32_ptr_ptr_ptr_fn)
(volatile void **,
void *, const void *);
+#endif
APR_DECLARE(apr_uint32_t) apr_atomic_add32(volatile apr_uint32_t *mem, apr_uint32_t val)
{
#if (defined(_M_IA64) || defined(_M_AMD64))
return InterlockedExchangeAdd(mem, val);
+#elif (_MSC_VER >= 1800)
+ return InterlockedExchangeAdd(mem, val);
#else
return ((apr_atomic_win32_ptr_val_fn)InterlockedExchangeAdd)(mem, val);
#endif
@@ -55,6 +59,8 @@ APR_DECLARE(void) apr_atomic_sub32(volatile apr_uint32_t *mem, apr_uint32_t val)
{
#if (defined(_M_IA64) || defined(_M_AMD64))
InterlockedExchangeAdd(mem, -val);
+#elif (_MSC_VER >= 1800)
+ InterlockedExchangeAdd(mem, -val);
#else
((apr_atomic_win32_ptr_val_fn)InterlockedExchangeAdd)(mem, -val);
#endif
@@ -65,6 +71,8 @@ APR_DECLARE(apr_uint32_t) apr_atomic_inc32(volatile apr_uint32_t *mem)
/* we return old value, win32 returns new value :( */
#if (defined(_M_IA64) || defined(_M_AMD64)) && !defined(RC_INVOKED)
return InterlockedIncrement(mem) - 1;
+#elif (_MSC_VER >= 1800)
+ return InterlockedIncrement(mem) - 1;
#else
return ((apr_atomic_win32_ptr_fn)InterlockedIncrement)(mem) - 1;
#endif
@@ -74,6 +82,8 @@ APR_DECLARE(int) apr_atomic_dec32(volatile apr_uint32_t *mem)
{
#if (defined(_M_IA64) || defined(_M_AMD64)) && !defined(RC_INVOKED)
return InterlockedDecrement(mem);
+#elif (_MSC_VER >= 1800)
+ return InterlockedDecrement(mem);
#else
return ((apr_atomic_win32_ptr_fn)InterlockedDecrement)(mem);
#endif
@@ -83,6 +93,8 @@ APR_DECLARE(void) apr_atomic_set32(volatile apr_uint32_t *mem, apr_uint32_t val)
{
#if (defined(_M_IA64) || defined(_M_AMD64)) && !defined(RC_INVOKED)
InterlockedExchange(mem, val);
+#elif (_MSC_VER >= 1800)
+ InterlockedExchange(mem, val);
#else
((apr_atomic_win32_ptr_val_fn)InterlockedExchange)(mem, val);
#endif
@@ -98,6 +110,8 @@ APR_DECLARE(apr_uint32_t) apr_atomic_cas32(volatile apr_uint32_t *mem, apr_uint3
{
#if (defined(_M_IA64) || defined(_M_AMD64)) && !defined(RC_INVOKED)
return InterlockedCompareExchange(mem, with, cmp);
+#elif (_MSC_VER >= 1800)
+ return InterlockedCompareExchange(mem, with, cmp);
#else
return ((apr_atomic_win32_ptr_val_val_fn)InterlockedCompareExchange)(mem, with, cmp);
#endif
@@ -107,6 +121,8 @@ APR_DECLARE(void *) apr_atomic_casptr(volatile void **mem, void *with, const voi
{
#if (defined(_M_IA64) || defined(_M_AMD64)) && !defined(RC_INVOKED)
return InterlockedCompareExchangePointer(mem, with, cmp);
+#elif (_MSC_VER >= 1800)
+ return InterlockedCompareExchangePointer(mem, with, cmp);
#else
/* Too many VC6 users have stale win32 API files, stub this */
return ((apr_atomic_win32_ptr_ptr_ptr_fn)InterlockedCompareExchange)(mem, with, cmp);
@@ -117,6 +133,8 @@ APR_DECLARE(apr_uint32_t) apr_atomic_xchg32(volatile apr_uint32_t *mem, apr_uint
{
#if (defined(_M_IA64) || defined(_M_AMD64)) && !defined(RC_INVOKED)
return InterlockedExchange(mem, val);
+#elif (_MSC_VER >= 1800)
+ return InterlockedExchange(mem, val);
#else
return ((apr_atomic_win32_ptr_val_fn)InterlockedExchange)(mem, val);
#endif
diff --git a/libs/esl/src/esl_event.c b/libs/esl/src/esl_event.c
index 19cb6708a5..0f9a33f1c1 100644
--- a/libs/esl/src/esl_event.c
+++ b/libs/esl/src/esl_event.c
@@ -306,7 +306,7 @@ ESL_DECLARE(esl_status_t) esl_event_del_header_val(esl_event_t *event, const cha
esl_assert(x < 1000000);
hash = esl_ci_hashfunc_default(header_name, &hlen);
- if ((!hp->hash || hash == hp->hash) && (hp->name && !strcasecmp(header_name, hp->name)) && (esl_strlen_zero(val) || !strcmp(hp->value, val))) {
+ if ((!hp->hash || hash == hp->hash) && (hp->name && !strcasecmp(header_name, hp->name)) && (esl_strlen_zero(val) || (hp->value && !strcmp(hp->value, val)))) {
if (lp) {
lp->next = hp->next;
} else {
diff --git a/libs/ilbc/src/iLBC_decode.c b/libs/ilbc/src/iLBC_decode.c
index 9fc7a24bb4..ddc164bed8 100644
--- a/libs/ilbc/src/iLBC_decode.c
+++ b/libs/ilbc/src/iLBC_decode.c
@@ -40,6 +40,7 @@
#include "hpOutput.h"
#include "syntFilter.h"
+#if (defined(WIN32) || defined(_WIN32)) && (_MSC_VER < 1800)
#if (defined(WIN32) || defined(_WIN32)) && !defined(_WIN64)
__inline long int rint(double dbl)
{
@@ -63,6 +64,7 @@
#endif
}
#endif
+#endif
/*----------------------------------------------------------------*
* Initiation of decoder instance.
diff --git a/libs/libsndfile/src/float_cast.h b/libs/libsndfile/src/float_cast.h
index 2c06aaf233..98c7de74b1 100644
--- a/libs/libsndfile/src/float_cast.h
+++ b/libs/libsndfile/src/float_cast.h
@@ -158,6 +158,7 @@
}
#elif defined(_WIN64)
+#if (_MSC_VER < 1800)
__inline long int lrint(double x)
{
return (long int) (x);
@@ -166,6 +167,7 @@
{
return (long int) (x);
}
+#endif
#elif (defined (__MWERKS__) && defined (macintosh))
/* This MacOS 9 solution was provided by Stephane Letz */
diff --git a/libs/sofia-sip/libsofia-sip-ua/sdp/sdp_parse.c b/libs/sofia-sip/libsofia-sip-ua/sdp/sdp_parse.c
index 3c23693583..87ef5308eb 100644
--- a/libs/sofia-sip/libsofia-sip-ua/sdp/sdp_parse.c
+++ b/libs/sofia-sip/libsofia-sip-ua/sdp/sdp_parse.c
@@ -1803,7 +1803,9 @@ static int parse_ul(sdp_parser_t *p, char **r,
}
#if !HAVE_STRTOULL
-unsigned longlong strtoull(char const *string, char **return_end, int base);
+#if !((defined(WIN32) || defined(_WIN32)) && (_MSC_VER >= 1800))
+unsigned long long strtoull(char const *string, char **return_end, int base);
+#endif
#endif
/*
diff --git a/libs/sofia-sip/libsofia-sip-ua/su/strtoull.c b/libs/sofia-sip/libsofia-sip-ua/su/strtoull.c
index c4854aaeac..824a39df43 100644
--- a/libs/sofia-sip/libsofia-sip-ua/su/strtoull.c
+++ b/libs/sofia-sip/libsofia-sip-ua/su/strtoull.c
@@ -73,7 +73,10 @@ static char cvtIn[] = {
20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
30, 31, 32, 33, 34, 35};
-
+
+
+#if !((defined(WIN32) || defined(_WIN32)) && (_MSC_VER >= 1800))
+
/**Convert an ASCII string into an unsigned long long integer.
*
* @param[in] string String of ASCII digits, possibly preceded by white
@@ -284,3 +287,5 @@ strtoull(const char *string, char **endPtr, int base)
return (unsigned longlong)-1;
}
+
+#endif
diff --git a/libs/sofia-sip/libsofia-sip-ua/su/su_taglist.c b/libs/sofia-sip/libsofia-sip-ua/su/su_taglist.c
index 65037c2d18..431a2dcb56 100644
--- a/libs/sofia-sip/libsofia-sip-ua/su/su_taglist.c
+++ b/libs/sofia-sip/libsofia-sip-ua/su/su_taglist.c
@@ -60,8 +60,10 @@
#include <sofia-sip/su_string.h>
#ifndef HAVE_STRTOULL
+#if !((defined(WIN32) || defined(_WIN32)) && (_MSC_VER >= 1800))
unsigned longlong strtoull(const char *, char **, int);
#endif
+#endif
/**@defgroup su_tag Tag Item Lists
*