Workaround for bug in strxfrm() in Microsoft's newer C runtimes. (#343919,

2006-06-08  Tor Lillqvist  <tml@novell.com>

	* glib/gunicollate.c (msc_strxfrm_wrapper): Workaround for bug in
	strxfrm() in Microsoft's newer C runtimes. (#343919, Kazuki
	Iwamoto)
This commit is contained in:
Tor Lillqvist 2006-06-08 15:24:10 +00:00 committed by Tor Lillqvist
parent 7b9c3b95bf
commit c795837524
3 changed files with 30 additions and 0 deletions

View File

@ -1,3 +1,9 @@
2006-06-08 Tor Lillqvist <tml@novell.com>
* glib/gunicollate.c (msc_strxfrm_wrapper): Workaround for bug in
strxfrm() in Microsoft's newer C runtimes. (#343919, Kazuki
Iwamoto)
2006-06-05 Matthias Clasen <mclasen@redhat.com>
* configure.in: Bump version

View File

@ -1,3 +1,9 @@
2006-06-08 Tor Lillqvist <tml@novell.com>
* glib/gunicollate.c (msc_strxfrm_wrapper): Workaround for bug in
strxfrm() in Microsoft's newer C runtimes. (#343919, Kazuki
Iwamoto)
2006-06-05 Matthias Clasen <mclasen@redhat.com>
* configure.in: Bump version

View File

@ -30,6 +30,24 @@
#include "gunicodeprivate.h"
#include "galias.h"
#ifdef _MSC_VER
/* Workaround for bug in MSVCR80.DLL */
static size_t
msc_strxfrm_wrapper (char *string1,
const char *string2,
size_t count)
{
if (!string1 || count <= 0)
{
char tmp;
return strxfrm (&tmp, string2, 1);
}
return strxfrm (string1, string2, count);
}
#define strxfrm msc_strxfrm_wrapper
#endif
/**
* g_utf8_collate:
* @str1: a UTF-8 encoded string