[Box Backup-dev] COMMIT r426 - box/chris/win32/vc2005-compile-fixes/lib/win32

boxbackup-dev@fluffy.co.uk boxbackup-dev@fluffy.co.uk
Sat, 11 Feb 2006 22:13:25 +0000 (GMT)


Author: chris
Date: 2006-02-11 22:13:22 +0000 (Sat, 11 Feb 2006)
New Revision: 426

Modified:
   box/chris/win32/vc2005-compile-fixes/lib/win32/emu.h
Log:
* emu.h
- Make prototype of ConvertFromWideString available
- Define a prototype for _cgetws() on MinGW


Modified: box/chris/win32/vc2005-compile-fixes/lib/win32/emu.h
===================================================================
--- box/chris/win32/vc2005-compile-fixes/lib/win32/emu.h	2006-02-11 22:12:38 UTC (rev 425)
+++ box/chris/win32/vc2005-compile-fixes/lib/win32/emu.h	2006-02-11 22:13:22 UTC (rev 426)
@@ -468,10 +468,8 @@
 // caller must free the returned buffer with delete[]
 char* ConvertUtf8ToConsole(const char* pString);
 char* ConvertConsoleToUtf8(const char* pString);
+char* ConvertFromWideString(const WCHAR* pString, unsigned int DestCodepage);
 
-// std::string ConvertUtf8ToConsoleString(const std::string& rUtf8String);
-// std::string ConvertConsoleToUtf8String(const std::string& rConsoleString);
-
 //
 // MessageId: MSG_ERR_EXIST
 // MessageText:
@@ -479,4 +477,8 @@
 //
 #define MSG_ERR_EXIST                         ((DWORD)0xC0000004L)
 
+#ifdef __MINGW32__
+	extern "C" { _CRTIMP wchar_t* __cdecl _cgetws (wchar_t *); }
+#endif
+
 #endif // !EMU_INCLUDE && WIN32