added missing #include "wx/buffer.h"

[wxWidgets.git] / include / wx / wxcrt.h

diff --git a/include/wx/wxcrt.h b/include/wx/wxcrt.h
index 74a63624d60309d923fc9e1b0294d7b106cdef77..060f05dbbff6c2c6779b49184f54e1313375f15e 100644 (file)
--- a/include/wx/wxcrt.h
+++ b/include/wx/wxcrt.h
@@ -29,7 +29,7 @@
     // function used to update the flag:
     extern WXDLLIMPEXP_BASE void wxUpdateLocaleIsUtf8();
     #else // !wxUSE_UNICODE_UTF8
     // function used to update the flag:
     extern WXDLLIMPEXP_BASE void wxUpdateLocaleIsUtf8();
     #else // !wxUSE_UNICODE_UTF8

-    inline WXDLLIMPEXP_BASE void wxUpdateLocaleIsUtf8() {}
+    inline void wxUpdateLocaleIsUtf8() {}

     #endif // wxUSE_UNICODE_UTF8/!wxUSE_UNICODE_UTF8
 #endif // __cplusplus
 
     #endif // wxUSE_UNICODE_UTF8/!wxUSE_UNICODE_UTF8
 #endif // __cplusplus
 


@@ -791,7 +791,7 @@ WXDLLIMPEXP_BASE wxChar * wxStrtok(wxChar *psz, const wxChar *delim, wxChar **sa
     WXDLLIMPEXP_BASE wxWCharBuffer wxSetlocale_(int category, const wxChar *locale);
     WXDLLIMPEXP_BASE wxWCharBuffer wxSetlocale(int category, const wxChar *locale);
     #else
     WXDLLIMPEXP_BASE wxWCharBuffer wxSetlocale_(int category, const wxChar *locale);
     WXDLLIMPEXP_BASE wxWCharBuffer wxSetlocale(int category, const wxChar *locale);
     #else

-    WXDLLIMPEXP_BASE const wxChar *wxSetlocale(int category, const wxChar *locale);
+    WXDLLIMPEXP_BASE wxChar *wxSetlocale(int category, const wxChar *locale);

     #endif // defined(wxSetlocale_)
 #endif // __cplusplus
 
     #endif // defined(wxSetlocale_)
 #endif // __cplusplus