Commit 743d8a48 authored by Nirbhay Choubey's avatar Nirbhay Choubey

Merge of fix for bug#13106585 from mysql-5.1.

parents afdfc6ac 62a40350
...@@ -156,6 +156,7 @@ ${CURSES_INCLUDE_PATH} ...@@ -156,6 +156,7 @@ ${CURSES_INCLUDE_PATH}
SET(LIBEDIT_SOURCES SET(LIBEDIT_SOURCES
chared.c chared.c
chartype.c
el.c el.c
eln.c eln.c
history.c history.c
......
...@@ -258,9 +258,6 @@ out: ...@@ -258,9 +258,6 @@ out:
return NULL; return NULL;
} }
#ifdef WIDECHAR
int wcwidth(wchar_t wc); // Signature.
#endif
protected int protected int
ct_visual_width(Char c) ct_visual_width(Char c)
......
...@@ -247,15 +247,6 @@ int tok_str(Tokenizer *, const char *, ...@@ -247,15 +247,6 @@ int tok_str(Tokenizer *, const char *,
/* /*
* Begin Wide Character Support * Begin Wide Character Support
*/ */
#ifdef __linux__
/* Apparently we need _GNU_SOURCE defined to get access to wcsdup on Linux */
#ifndef _GNU_SOURCE
#define _GNU_SOURCE
#endif
#endif
#include <wchar.h>
#include <wctype.h>
/* /*
* Wide character versions * Wide character versions
......
...@@ -40,8 +40,6 @@ static char sccsid[] = "@(#)refresh.c 8.1 (Berkeley) 6/4/93"; ...@@ -40,8 +40,6 @@ static char sccsid[] = "@(#)refresh.c 8.1 (Berkeley) 6/4/93";
#endif #endif
#endif /* not lint && not SCCSID */ #endif /* not lint && not SCCSID */
#include "chartype.c" /* XXXMYSQL */
/* /*
* refresh.c: Lower level screen refreshing functions * refresh.c: Lower level screen refreshing functions
*/ */
......
...@@ -92,8 +92,21 @@ size_t strlcpy(char *dst, const char *src, size_t size); ...@@ -92,8 +92,21 @@ size_t strlcpy(char *dst, const char *src, size_t size);
char *fgetln(FILE *fp, size_t *len); char *fgetln(FILE *fp, size_t *len);
#endif #endif
#ifndef HAVE_WCSDUP #ifdef __linux__
/* Apparently we need _GNU_SOURCE defined to get access to wcsdup on Linux */
#ifndef _GNU_SOURCE
#define _GNU_SOURCE
#endif
#endif
#ifndef __USE_XOPEN
#define __USE_XOPEN
#endif
#include <wchar.h> #include <wchar.h>
#include <wctype.h>
#ifndef HAVE_WCSDUP
wchar_t *wcsdup(const wchar_t *); wchar_t *wcsdup(const wchar_t *);
#endif #endif
......
...@@ -636,9 +636,6 @@ mc_again: ...@@ -636,9 +636,6 @@ mc_again:
el->el_cursor.h = where; /* now where is here */ el->el_cursor.h = where; /* now where is here */
} }
#ifdef WIDECHAR
int wcwidth(wchar_t); // Signature.
#endif
/* terminal_overwrite(): /* terminal_overwrite():
* Overstrike num characters * Overstrike num characters
......
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