diff options
| author | Karen Langford <karen.langford@oracle.com> | 2011-10-28 16:40:46 +0200 |
|---|---|---|
| committer | Karen Langford <karen.langford@oracle.com> | 2011-10-28 16:40:46 +0200 |
| commit | 381571fdca8c45371ff15b4301161a75c48a9fd1 (patch) | |
| tree | 1f3cc1d5f359d115cc30623230531fbf88e9c86f /cmd-line-utils | |
| parent | ff758c8c45c4feb78d93eaa8a06ebb22b2685aea (diff) | |
| download | mariadb-git-381571fdca8c45371ff15b4301161a75c48a9fd1.tar.gz | |
Patch to fix libedit vis.h problem (OSX/FreeBSD)
Diffstat (limited to 'cmd-line-utils')
| -rw-r--r-- | cmd-line-utils/libedit/np/unvis.c | 8 | ||||
| -rw-r--r-- | cmd-line-utils/libedit/np/vis.c | 8 | ||||
| -rw-r--r-- | cmd-line-utils/libedit/read.c | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/cmd-line-utils/libedit/np/unvis.c b/cmd-line-utils/libedit/np/unvis.c index 4c523608c27..9267db71137 100644 --- a/cmd-line-utils/libedit/np/unvis.c +++ b/cmd-line-utils/libedit/np/unvis.c @@ -50,11 +50,11 @@ static char sccsid[] = "@(#)unvis.c 8.1 (Berkeley) 6/4/93"; #include <stdint.h> #include <stdio.h> #include <errno.h> -#ifdef HAVE_VIS_H -#include <vis.h> -#else +/* + XXXMYSQL : Due to different versions of vis.h available, + use the one bundled with libedit. +*/ #include "np/vis.h" -#endif #ifdef __weak_alias __weak_alias(strnunvisx,_strnunvisx) diff --git a/cmd-line-utils/libedit/np/vis.c b/cmd-line-utils/libedit/np/vis.c index 6c75438c352..d7cc37b4f47 100644 --- a/cmd-line-utils/libedit/np/vis.c +++ b/cmd-line-utils/libedit/np/vis.c @@ -68,11 +68,11 @@ #include <sys/types.h> #include <assert.h> -#ifdef HAVE_VIS_H -#include <vis.h> -#else +/* + XXXMYSQL : Due to different versions of vis.h available, + use the one bundled with libedit. +*/ #include "np/vis.h" -#endif #include <errno.h> #include <stdlib.h> diff --git a/cmd-line-utils/libedit/read.c b/cmd-line-utils/libedit/read.c index 48bf4efd59b..a919b888965 100644 --- a/cmd-line-utils/libedit/read.c +++ b/cmd-line-utils/libedit/read.c @@ -333,7 +333,7 @@ memset(&state, 0, sizeof(mbstate_t)); #ifdef WIDECHAR ++cbp; - if (cbp > MB_CUR_MAX) { /* "shouldn't happen" */ + if (cbp > (size_t) MB_CUR_MAX) { /* "shouldn't happen" */ *cp = '\0'; return (-1); } |