mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 10:14:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Patch to fix libedit vis.h problem (OSX/FreeBSD)

Browse source
This commit is contained in:
Karen Langford 2011-10-28 16:40:46 +02:00
parent ff758c8c45
commit 381571fdca
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cmd-line-utils/libedit/np/unvis.c
View file

@ -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)

8
cmd-line-utils/libedit/np/vis.c
View file

@ -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>

2
cmd-line-utils/libedit/read.c
View file

@ -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);
}