Reverted r28531 since we have working wcrtomb() and mbrtowc().
Seems like we didn't remember to change it back, even with the #warning. :-) I tested ftp and it works fine. This also closes ticket #4176. +alphabranch git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32766 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
parent
42529205ad
commit
11dbc6cf7a
|
@ -109,7 +109,7 @@ static char sccsid[] = "@(#)glob.c 8.3 (Berkeley) 10/13/93";
|
||||||
#define SLASH '/'
|
#define SLASH '/'
|
||||||
#define COMMA ','
|
#define COMMA ','
|
||||||
|
|
||||||
#if !defined(DEBUG) && !defined(__HAIKU__)
|
#ifndef DEBUG
|
||||||
|
|
||||||
#define M_QUOTE 0x8000000000ULL
|
#define M_QUOTE 0x8000000000ULL
|
||||||
#define M_PROTECT 0x4000000000ULL
|
#define M_PROTECT 0x4000000000ULL
|
||||||
|
@ -164,28 +164,6 @@ static int match(Char *, Char *, Char *);
|
||||||
static void qprintf(const char *, Char *);
|
static void qprintf(const char *, Char *);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef __HAIKU__
|
|
||||||
# warning glob() wants to use wide character functions
|
|
||||||
|
|
||||||
static size_t
|
|
||||||
my_wcrtomb(char* to, char wchar, mbstate_t* state)
|
|
||||||
{
|
|
||||||
*to = wchar;
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
static size_t
|
|
||||||
my_mbrtowc(wchar_t* to, const char* string, size_t len, mbstate_t* state)
|
|
||||||
{
|
|
||||||
if (!string[0])
|
|
||||||
return 0;
|
|
||||||
*to = *string;
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
# define wcrtomb my_wcrtomb
|
|
||||||
# define mbrtowc my_mbrtowc
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
int
|
int
|
||||||
|
|
Loading…
Reference in New Issue