fix char related code

[guile-irrlicht.git] / src / wchar.cpp

diff --git a/src/wchar.cpp b/src/wchar.cpp
index a41a00313569681ab7de4d97dff80519aa881c05..e9c98ed8478d305bcd40bf1bc396d3db85c4156b 100644 (file)
--- a/src/wchar.cpp
+++ b/src/wchar.cpp
@@ -24,19 +24,13 @@
 #include "wchar.h"
 
 SCM
-scm_from_wide_char_string (const wchar_t* wtext)
+scm_from_wide_char_string (const wchar_t* text)
 {
-  size_t nbytes = wcslen (wtext) + 1;
-  char* ctext = (char*)malloc (nbytes);
-  wcstombs (ctext, wtext, nbytes);
-  return scm_from_utf8_string (ctext);
+  return scm_from_utf32_string ((const scm_t_wchar*) text);
 }
 
 const wchar_t*
 scm_to_wide_char_string (SCM text)
 {
-  char* ctext = scm_to_utf8_stringn (text, NULL);
-  wchar_t* wtext = (wchar_t*)malloc ((strlen (ctext) + 1) * sizeof (wchar_t));
-  mbstowcs (wtext, ctext, strlen (ctext) + 1);
-  return wtext;
+  return (const wchar_t*) scm_to_utf32_string (text);
 }