From b8a02a2b98e7b0e6a8a54cb140a873039d9c6d3d Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 30 Jun 2012 13:33:28 +0000 Subject: - setting thread names; - warning fixes; - code cleaning; - option to disable sounds during idle git-svn-id: http://svn.miranda-ng.org/main/trunk@692 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/modules/json/JSONMemory.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/modules/json/JSONMemory.cpp') diff --git a/src/modules/json/JSONMemory.cpp b/src/modules/json/JSONMemory.cpp index bd9cd045a2..08b6d7fd70 100644 --- a/src/modules/json/JSONMemory.cpp +++ b/src/modules/json/JSONMemory.cpp @@ -58,7 +58,7 @@ void * JSONMemory::json_malloc(size_t siz){ JSON_ASSERT(result, JSON_TEXT("out of memory")); return result; #else - return mymalloc(siz); + return mymalloc((unsigned long)siz); #endif } #ifdef JSON_DEBUG //in debug mode, see if the malloc was successful @@ -77,7 +77,7 @@ void * JSONMemory::json_realloc(void * ptr, size_t siz){ JSON_ASSERT(result, JSON_TEXT("out of memory")); return result; #else - return myrealloc(ptr, siz); + return myrealloc(ptr, (unsigned long)siz); #endif } #ifdef JSON_DEBUG //in debug mode, see if the malloc was successful -- cgit v1.2.3