summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2004-10-29 02:00:05 +0000
committerTor Lillqvist <tml@src.gnome.org>2004-10-29 02:00:05 +0000
commit37d3825e295cc50fd2136e631e23a06824904be4 (patch)
treefbae33cc2593f6bfde8e460216f681653dabaf46
parentbe4d82189fd959459c21f8c4cc47a04a09833bf0 (diff)
downloadglib-37d3825e295cc50fd2136e631e23a06824904be4.tar.gz
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)
-rw-r--r--ChangeLog6
-rw-r--r--ChangeLog.pre-2-106
-rw-r--r--ChangeLog.pre-2-126
-rw-r--r--ChangeLog.pre-2-66
-rw-r--r--ChangeLog.pre-2-86
-rw-r--r--glib/giochannel.h4
6 files changed, 34 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index da7cb8ca4..fb0d0e3ff 100644
--- 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 da7cb8ca4..fb0d0e3ff 100644
--- 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 da7cb8ca4..fb0d0e3ff 100644
--- 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 da7cb8ca4..fb0d0e3ff 100644
--- 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 da7cb8ca4..fb0d0e3ff 100644
--- 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 c09b3b6a2..b23be3e64 100644
--- 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);