From: Nirbhay Choubey
Date: September 23 2011 3:10pm
Subject: bzr push into mysql-trunk branch (nirbhay.choubey:3242 to 3243)
List-Archive: http://lists.mysql.com/commits/141111
Message-Id: <201109231510.p8NFABcV010945@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3243 Nirbhay Choubey	2011-09-23
      Fixing build failures on FreeBSD and Darwin.

    modified:
      cmd-line-utils/libedit/chartype.h
      cmd-line-utils/libedit/sys.h
 3242 Nirbhay Choubey	2011-08-15
      WL#5945 : Improve libedit library
      
      * Switched to restartable multibyte routines.
      * Added files to support NARROW and WIDE mode compilation.
      * Added some readline compatible key-bindings.
      * Raised editline buffer size from 1024 to 4096 in order
        to increase the length of commends that can be handled
        by history.

    added:
      cmd-line-utils/libedit/historyn.c
      cmd-line-utils/libedit/tokenizern.c
    modified:
      cmd-line-utils/libedit/CMakeLists.txt
      cmd-line-utils/libedit/chartype.c
      cmd-line-utils/libedit/chartype.h
      cmd-line-utils/libedit/config.h
      cmd-line-utils/libedit/el.c
      cmd-line-utils/libedit/el.h
      cmd-line-utils/libedit/eln.c
      cmd-line-utils/libedit/keymacro.c
      cmd-line-utils/libedit/read.c
      cmd-line-utils/libedit/readline.c
      cmd-line-utils/libedit/terminal.c
      cmd-line-utils/libedit/vi.c
=== modified file 'cmd-line-utils/libedit/chartype.h'
--- a/cmd-line-utils/libedit/chartype.h	2011-08-15 06:46:56 +0000
+++ b/cmd-line-utils/libedit/chartype.h	2011-09-23 15:07:31 +0000
@@ -44,7 +44,12 @@
  * supports non-BMP code points without requiring UTF-16, but nothing
  * seems to actually advertise this properly, despite Unicode 3.1 having
  * been around since 2001... */
-#if !defined(__NetBSD__) && !defined(__sun) && !(defined(__APPLE__) && defined(__MACH__))
+
+/* XXXMYSQL : Added FreeBSD to bypass this check.
+  TODO : Verify if FreeBSD stores ISO 10646 in wchar_t. */
+#if !defined(__NetBSD__) && !defined(__sun) \
+  && !(defined(__APPLE__) && defined(__MACH__)) \
+  && !defined(__FreeBSD__)
 #ifndef __STDC_ISO_10646__
 /* In many places it is assumed that the first 127 code points are ASCII
  * compatible, so ensure wchar_t indeed does ISO 10646 and not some other

=== modified file 'cmd-line-utils/libedit/sys.h'
--- a/cmd-line-utils/libedit/sys.h	2011-07-29 10:02:07 +0000
+++ b/cmd-line-utils/libedit/sys.h	2011-09-23 15:07:31 +0000
@@ -92,6 +92,8 @@ size_t	strlcpy(char *dst, const char *sr
 char	*fgetln(FILE *fp, size_t *len);
 #endif
 
+#include <wchar.h>
+
 #ifndef HAVE_WCSDUP
 wchar_t *wcsdup(const wchar_t *);
 #endif

No bundle (reason: useless for push emails).