Redefine also g_io_channel_new_file to the UTF-8 version on Win32.

2004-10-29  Tor Lillqvist  <tml@iki.fi>

	* glib/giochannel.h (g_io_channel_new_file): Redefine also
	g_io_channel_new_file to the UTF-8 version on Win32. [156725,
	Kazuki IWAMOTO)

diff --git a/ChangeLog b/ChangeLog
index da7cb8c..fb0d0e3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-10-29  Tor Lillqvist  <tml@iki.fi>
+
+       * glib/giochannel.h (g_io_channel_new_file): Redefine also
+       g_io_channel_new_file to the UTF-8 version on Win32. [156725,
+       Kazuki IWAMOTO)
+
 2004-10-28  Ray Strode  <rstrode@redhat.com>
 
        * glib/gkeyfile.c

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index da7cb8c..fb0d0e3 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2004-10-29  Tor Lillqvist  <tml@iki.fi>
+
+       * glib/giochannel.h (g_io_channel_new_file): Redefine also
+       g_io_channel_new_file to the UTF-8 version on Win32. [156725,
+       Kazuki IWAMOTO)
+
 2004-10-28  Ray Strode  <rstrode@redhat.com>
 
        * glib/gkeyfile.c

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index da7cb8c..fb0d0e3 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,9 @@
+2004-10-29  Tor Lillqvist  <tml@iki.fi>
+
+       * glib/giochannel.h (g_io_channel_new_file): Redefine also
+       g_io_channel_new_file to the UTF-8 version on Win32. [156725,
+       Kazuki IWAMOTO)
+
 2004-10-28  Ray Strode  <rstrode@redhat.com>
 
        * glib/gkeyfile.c

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index da7cb8c..fb0d0e3 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2004-10-29  Tor Lillqvist  <tml@iki.fi>
+
+       * glib/giochannel.h (g_io_channel_new_file): Redefine also
+       g_io_channel_new_file to the UTF-8 version on Win32. [156725,
+       Kazuki IWAMOTO)
+
 2004-10-28  Ray Strode  <rstrode@redhat.com>
 
        * glib/gkeyfile.c

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index da7cb8c..fb0d0e3 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2004-10-29  Tor Lillqvist  <tml@iki.fi>
+
+       * glib/giochannel.h (g_io_channel_new_file): Redefine also
+       g_io_channel_new_file to the UTF-8 version on Win32. [156725,
+       Kazuki IWAMOTO)
+
 2004-10-28  Ray Strode  <rstrode@redhat.com>
 
        * glib/gkeyfile.c

diff --git a/glib/giochannel.h b/glib/giochannel.h
index c09b3b6..b23be3e 100644 (file)
--- a/glib/giochannel.h
+++ b/glib/giochannel.h
@@ -260,6 +260,10 @@ GIOStatus   g_io_channel_seek_position    (GIOChannel   *channel,
                                           gint64        offset,
                                           GSeekType     type,
                                           GError      **error);
+#ifdef G_OS_WIN32
+#define g_io_channel_new_file g_io_channel_new_file_utf8
+#endif
+
 GIOChannel* g_io_channel_new_file         (const gchar  *filename,
                                           const gchar  *mode,
                                           GError      **error);