diff --git a/os/pl-stream.c b/os/pl-stream.c index 578a2e024..4bc122cdf 100755 --- a/os/pl-stream.c +++ b/os/pl-stream.c @@ -33,7 +33,6 @@ #endif #endif #include -#include "windows/mswchar.h" #define CRLF_MAPPING 1 #else #include @@ -3527,7 +3526,7 @@ SinitStreams(void) IOSTREAM * -S__getiob() +S__getiob(void) { return S__iob; } diff --git a/os/windows/mswchar.h b/os/windows/mswchar.h deleted file mode 100644 index f43d230a3..000000000 --- a/os/windows/mswchar.h +++ /dev/null @@ -1,38 +0,0 @@ -/* $Id$ - - Part of SWI-Prolog - - Author: Jan Wielemaker - E-mail: wielemak@science.uva.nl - WWW: http://www.swi-prolog.org - Copyright (C): 1985-2005, University of Amsterdam - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -*/ - -#include - -/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -See pl-mswchar.cpp for the motivation for this nonsense. Used in -pl-fli.c and pl-text.c. -- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifdef __WINDOWS__ -#define wcrtomb(s, wc, ps) ms_wcrtomb(s, wc, ps) -#define mbrtowc(pwc, s, n, ps) ms_mbrtowc(pwc, s, n, ps) - -extern size_t ms_wcrtomb(char *s, wchar_t wc, mbstate_t *ps); -extern size_t ms_mbrtowc(wchar_t *pwc, const char *s, size_t n, mbstate_t *ps); -#endif