From 2fcd93c6fca1922edfa5c180c5c989b97359a6dc Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Tue, 11 Dec 2007 20:25:15 +0000 Subject: [PATCH] cleanup some macros a bit more. git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@6665 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/include/switch_platform.h | 2 +- src/include/switch_utils.h | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/include/switch_platform.h b/src/include/switch_platform.h index 2293a64dc8..f266d9b902 100644 --- a/src/include/switch_platform.h +++ b/src/include/switch_platform.h @@ -69,7 +69,7 @@ SWITCH_BEGIN_EXTERN_C #pragma include_alias(, <../../libs/libteletone/src/libteletone_generate.h>) #pragma include_alias(, <../../libs/libteletone/src/libteletone_detect.h>) -#if (_MSC_VER >= 1500) // VC8+ +#if (_MSC_VER >= 1500) // VC9+ #define switch_assert(expr) assert(expr);__analysis_assume( expr ) #endif diff --git a/src/include/switch_utils.h b/src/include/switch_utils.h index ebad8afc66..f366b449b1 100644 --- a/src/include/switch_utils.h +++ b/src/include/switch_utils.h @@ -352,9 +352,14 @@ SWITCH_DECLARE(char *) switch_find_end_paren(const char *s, char open, char clos #define switch_malloc(ptr, len) (void)( (!!(ptr = malloc(len))) || (fprintf(stderr,"ABORT! Malloc failure at: %s:%s", __FILE__, __LINE__),abort(), 0), ptr ) #define switch_zmalloc(ptr, len) (void)( (!!(ptr = malloc(len))) || (fprintf(stderr,"ABORT! Malloc failure at: %s:%s", __FILE__, __LINE__),abort(), 0), memset(ptr, 0, len)) #else +#if (_MSC_VER >= 1500) // VC9+ +#define switch_malloc(ptr, len) (void)(assert(((ptr) = malloc((len)))),ptr);__analysis_assume( ptr ) +#define switch_zmalloc(ptr, len) (void)(assert((ptr = malloc(len))),memset(ptr, 0, len));__analysis_assume( ptr ) +#else #define switch_malloc(ptr, len) (void)(assert(((ptr) = malloc((len)))),ptr) #define switch_zmalloc(ptr, len) (void)(assert((ptr = malloc(len))),memset(ptr, 0, len)) #endif +#endif SWITCH_END_EXTERN_C #endif