Added binary and unicode file i/o support to msvcrt.

[reactos.git] / reactos / lib / crtdll / stdlib / wcstombs.c

diff --git a/reactos/lib/crtdll/stdlib/wcstombs.c b/reactos/lib/crtdll/stdlib/wcstombs.c
index 32fb7a0..01f59f6 100644 (file)
--- a/reactos/lib/crtdll/stdlib/wcstombs.c
+++ b/reactos/lib/crtdll/stdlib/wcstombs.c
@@ -16,11 +16,11 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#include <crtdll/stdlib.h>
-#include <crtdll/wchar.h>
+#include <msvcrt/stdlib.h>
+#include <msvcrt/wchar.h>
 
-#include <crtdll/errno.h>
-#include <crtdll/wchar.h>
+#include <msvcrt/errno.h>
+#include <msvcrt/wchar.h>
 
 #ifndef EILSEQ
 #define EILSEQ EINVAL
@@ -39,10 +39,12 @@ static const unsigned char encoding_byte[] =
 
 /* We don't need the state really because we don't have shift states
    to maintain between calls to this function.  */
-static mbstate_t internal;
+typedef int mbstate_t;
+static mbstate_t mbstate_internal;
 
 
-extern mbstate_t __no_r_state;  /* Defined in mbtowc.c.  */
+mbstate_t __no_r_state;  /* Now defined in wcstombs.c.  */
+//extern mbstate_t __no_r_state;  /* Defined in mbtowc.c.  */
 
 size_t
 __wcsrtombs (char *dst, const wchar_t **src, size_t len, mbstate_t *ps);
@@ -77,7 +79,7 @@ __wcsrtombs (char *dst, const wchar_t **src, size_t len, mbstate_t *ps)
   const wchar_t *run = *src;
 
   if (ps == NULL)
-    ps = &internal;
+    ps = &mbstate_internal;
 
   if (dst == NULL)
     /* The LEN parameter has to be ignored if we don't actually write
@@ -149,4 +151,4 @@ __wcsrtombs (char *dst, const wchar_t **src, size_t len, mbstate_t *ps)
 
   return written;
 }
-//weak_alias (__wcsrtombs, wcsrtombs)
\ No newline at end of file
+//weak_alias (__wcsrtombs, wcsrtombs)