From 00922404011769e4b981ca1cc2c2404c022770a0 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Tue, 17 May 2011 15:08:40 +0200 Subject: lib/util/charset: fix the toplevel MacOS X build. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Guenther Autobuild-User: Günther Deschner Autobuild-Date: Tue May 17 16:16:59 CEST 2011 on sn-devel-104 --- lib/util/charset/charset_macosxfs.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lib/util/charset') diff --git a/lib/util/charset/charset_macosxfs.c b/lib/util/charset/charset_macosxfs.c index 8c2fdc7776..4d2ba5b6ff 100644 --- a/lib/util/charset/charset_macosxfs.c +++ b/lib/util/charset/charset_macosxfs.c @@ -30,6 +30,7 @@ */ #include "includes.h" +#undef realloc /* * Include OS frameworks. These are only needed in this module. @@ -61,7 +62,7 @@ static inline void *resize_buffer (void *buffer, size_t *size, size_t newsize) { if (newsize > *size) { *size = newsize + 128; - buffer = SMB_REALLOC(buffer, *size); + buffer = realloc(buffer, *size); } return buffer; } @@ -372,7 +373,7 @@ static size_t macosxfs_encoding_push( cfsize = CFStringGetLength(cfstring); charsconverted = CFStringGetBytes( cfstring, CFRangeMake(0,cfsize), - script_code, 0, False, + script_code, 0, false, *outbuf, *outbytesleft, &outsize); if (0 == charsconverted) { -- cgit