diff options
| author | Michael Widenius <monty@askmonty.org> | 2012-04-02 12:27:15 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2012-04-02 12:27:15 +0300 |
| commit | ca28d5fcf82686f60b0e439e60fbbce5387d8ccd (patch) | |
| tree | 04a3896439d621b789cad0270239b02ffd964712 /cmd-line-utils | |
| parent | c01ec9d5831ec000d57f0fe01b45f324939e37fb (diff) | |
| parent | 398f754b542487d0b2258f47d088eb6c6c2824f7 (diff) | |
| download | mariadb-git-ca28d5fcf82686f60b0e439e60fbbce5387d8ccd.tar.gz | |
automatic merge
Diffstat (limited to 'cmd-line-utils')
| -rw-r--r-- | cmd-line-utils/libedit/chartype.h | 2 | ||||
| -rw-r--r-- | cmd-line-utils/libedit/np/unvis.c | 2 | ||||
| -rw-r--r-- | cmd-line-utils/libedit/np/vis.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/cmd-line-utils/libedit/chartype.h b/cmd-line-utils/libedit/chartype.h index 40012afb47d..576abe13ad5 100644 --- a/cmd-line-utils/libedit/chartype.h +++ b/cmd-line-utils/libedit/chartype.h @@ -49,7 +49,7 @@ TODO : Verify if FreeBSD & AIX stores ISO 10646 in wchar_t. */ #if !defined(__NetBSD__) && !defined(__sun) \ && !(defined(__APPLE__) && defined(__MACH__)) \ - && !defined(__FreeBSD__) && !defined(_AIX) + && !defined(__FreeBSD__) && !defined(_AIX) && !defined(__OpenBSD__) #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 diff --git a/cmd-line-utils/libedit/np/unvis.c b/cmd-line-utils/libedit/np/unvis.c index 812d280b2d8..a911720ad35 100644 --- a/cmd-line-utils/libedit/np/unvis.c +++ b/cmd-line-utils/libedit/np/unvis.c @@ -64,7 +64,7 @@ static char sccsid[] = "@(#)unvis.c 8.1 (Berkeley) 6/4/93"; #include "np/vis.h" #ifdef __weak_alias -__weak_alias(strnunvisx,_strnunvisx) +__weak_alias(strnunvisx,_strnunvisx); #endif #if !HAVE_VIS diff --git a/cmd-line-utils/libedit/np/vis.c b/cmd-line-utils/libedit/np/vis.c index d7cc37b4f47..884a7894332 100644 --- a/cmd-line-utils/libedit/np/vis.c +++ b/cmd-line-utils/libedit/np/vis.c @@ -77,7 +77,7 @@ #include <stdlib.h> #ifdef __weak_alias -__weak_alias(strvisx,_strvisx) +__weak_alias(strvisx,_strvisx); #endif #if !HAVE_VIS || !HAVE_SVIS |