lib/util/charset: fix the toplevel MacOS X build.

Guenther

Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Tue May 17 16:16:59 CEST 2011 on sn-devel-104

diff --git a/lib/util/charset/charset_macosxfs.c b/lib/util/charset/charset_macosxfs.c
index 8c2fdc7776b41be4ec6e53060bdb1f8e47bd92fa..4d2ba5b6ffd5c7f70bd09fc26cabd5b4a5c89b91 100644 (file)
--- 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) {