From 1f631718dd51ea5058082d483b1c3d9cb2c4e168 Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Sat, 5 Jan 2008 03:35:15 +0000 Subject: [PATCH] use strndup replacement on msvc git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7087 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- libs/sqlite/src/sqliteInt.h | 4 ++++ libs/sqlite/src/util.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/libs/sqlite/src/sqliteInt.h b/libs/sqlite/src/sqliteInt.h index 26d83f4eea..cd5c23939b 100644 --- a/libs/sqlite/src/sqliteInt.h +++ b/libs/sqlite/src/sqliteInt.h @@ -287,7 +287,11 @@ static inline void *zmalloc(size_t x) #define sqliteMallocRaw(x) malloc(x)//sqlite3MallocRaw(x,1) #define sqliteRealloc(x,y) realloc(x, y)//sqlite3Realloc(x,y) #define sqliteStrDup(x) strdup(x)//sqlite3StrDup(x) +#ifdef _MSC_VER +#define sqliteStrNDup(x,y) sqlite3StrNDup(x,y) +#else #define sqliteStrNDup(x,y) strndup(x, y)//sqlite3StrNDup(x,y) +#endif #define sqliteReallocOrFree(x,y) sqlite3ReallocOrFree(x,y) #endif diff --git a/libs/sqlite/src/util.c b/libs/sqlite/src/util.c index 457227da0e..61068d0fd5 100644 --- a/libs/sqlite/src/util.c +++ b/libs/sqlite/src/util.c @@ -729,7 +729,7 @@ char *sqlite3StrDup(const char *z){ char *sqlite3StrNDup(const char *z, int n){ char *zNew; if( z==0 ) return 0; - zNew = sqlite3MallocRaw(n+1, 1); + zNew = sqliteMallocRaw(n+1, 1); if( zNew ){ memcpy(zNew, z, n); zNew[n] = 0;