Commit 20ffbd3d authored by Karen Langford's avatar Karen Langford

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

parent 2c67d506
......@@ -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)
......
......@@ -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>
......
......@@ -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);
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment