diff options
| author | Günther Deschner <gd@samba.org> | 2011-05-17 15:08:40 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2011-05-17 16:16:59 +0200 |
| commit | 00922404011769e4b981ca1cc2c2404c022770a0 (patch) | |
| tree | 835184939f7b5429cf7a5d0da402b193f7d19fc1 | |
| parent | cb227d6d1492247d8aff03807cac0b7266202a38 (diff) | |
| download | samba-00922404011769e4b981ca1cc2c2404c022770a0.tar.gz samba-00922404011769e4b981ca1cc2c2404c022770a0.tar.bz2 samba-00922404011769e4b981ca1cc2c2404c022770a0.zip | |
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
| -rw-r--r-- | lib/util/charset/charset_macosxfs.c | 5 |
1 files changed, 3 insertions, 2 deletions
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) { |