The branch, master has been updated
via 0092240 lib/util/charset: fix the toplevel MacOS X build.
from cb227d6 s3:rpc_server: create lp_ncalrpc_dir() with 0755 before
lp_ncalrpc_dir()/np with 0700
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 00922404011769e4b981ca1cc2c2404c022770a0
Author: Günther Deschner <[email protected]>
Date: Tue May 17 15:08:40 2011 +0200
lib/util/charset: fix the toplevel MacOS X build.
Guenther
Autobuild-User: Günther Deschner <[email protected]>
Autobuild-Date: Tue May 17 16:16:59 CEST 2011 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
lib/util/charset/charset_macosxfs.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/util/charset/charset_macosxfs.c
b/lib/util/charset/charset_macosxfs.c
index 8c2fdc7..4d2ba5b 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) {
--
Samba Shared Repository
