[glib] gdir: Remove old win32 codepage ABI compat code
- From: Christoph Reiter <creiter src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] gdir: Remove old win32 codepage ABI compat code
- Date: Thu, 6 Apr 2017 17:27:17 +0000 (UTC)
commit d43b3d889ad3ea2f0754251ed514610aad5cc9d5
Author: Christoph Reiter <creiter src gnome org>
Date: Tue Mar 28 07:59:38 2017 +0200
gdir: Remove old win32 codepage ABI compat code
Makes new code link against the normal symbol names again.
Variants with utf8 suffix are there for existing binaries/ABI compat.
https://bugzilla.gnome.org/show_bug.cgi?id=780634
glib/gdir.c | 88 +++++++++++++++++------------------------------------------
glib/gdir.h | 14 ---------
2 files changed, 25 insertions(+), 77 deletions(-)
---
diff --git a/glib/gdir.c b/glib/gdir.c
index 3f5b845..4f73837 100644
--- a/glib/gdir.c
+++ b/glib/gdir.c
@@ -159,36 +159,6 @@ g_dir_open (const gchar *path,
return dir;
}
-#if defined (G_OS_WIN32) && !defined (_WIN64)
-
-/* The above function actually is called g_dir_open_utf8, and it's
- * that what applications compiled with this GLib version will
- * use.
- */
-
-#undef g_dir_open
-
-/* Binary compatibility version. Not for newly compiled code. */
-
-GDir *
-g_dir_open (const gchar *path,
- guint flags,
- GError **error)
-{
- gchar *utf8_path = g_locale_to_utf8 (path, -1, NULL, NULL, error);
- GDir *retval;
-
- if (utf8_path == NULL)
- return NULL;
-
- retval = g_dir_open_utf8 (utf8_path, flags, error);
-
- g_free (utf8_path);
-
- return retval;
-}
-#endif
-
/*< private >
* g_dir_new_from_dirp:
* @dirp: a #DIR* created by opendir() or fdopendir()
@@ -293,39 +263,6 @@ g_dir_read_name (GDir *dir)
#endif
}
-#if defined (G_OS_WIN32) && !defined (_WIN64)
-
-/* Ditto for g_dir_read_name */
-
-#undef g_dir_read_name
-
-/* Binary compatibility version. Not for newly compiled code. */
-
-const gchar *
-g_dir_read_name (GDir *dir)
-{
- while (1)
- {
- const gchar *utf8_name = g_dir_read_name_utf8 (dir);
- gchar *retval;
-
- if (utf8_name == NULL)
- return NULL;
-
- retval = g_locale_from_utf8 (utf8_name, -1, NULL, NULL, NULL);
-
- if (retval != NULL)
- {
- strcpy (dir->utf8_buf, retval);
- g_free (retval);
-
- return dir->utf8_buf;
- }
- }
-}
-
-#endif
-
/**
* g_dir_rewind:
* @dir: a #GDir* created by g_dir_open()
@@ -363,3 +300,28 @@ g_dir_close (GDir *dir)
#endif
g_free (dir);
}
+
+#ifdef G_OS_WIN32
+
+/* Binary compatibility versions. Not for newly compiled code. */
+
+_GLIB_EXTERN GDir *g_dir_open_utf8 (const gchar *path,
+ guint flags,
+ GError **error);
+_GLIB_EXTERN const gchar *g_dir_read_name_utf8 (GDir *dir);
+
+GDir *
+g_dir_open_utf8 (const gchar *path,
+ guint flags,
+ GError **error)
+{
+ return g_dir_open (path, flags, error);
+}
+
+const gchar *
+g_dir_read_name_utf8 (GDir *dir)
+{
+ return g_dir_read_name (dir);
+}
+
+#endif
diff --git a/glib/gdir.h b/glib/gdir.h
index b0dbb32..531ed95 100644
--- a/glib/gdir.h
+++ b/glib/gdir.h
@@ -47,20 +47,6 @@ void g_dir_rewind (GDir *dir);
GLIB_AVAILABLE_IN_ALL
void g_dir_close (GDir *dir);
-#ifndef __GTK_DOC_IGNORE__
-#ifdef G_OS_WIN32
-#define g_dir_open g_dir_open_utf8
-#define g_dir_read_name g_dir_read_name_utf8
-
-GLIB_AVAILABLE_IN_ALL
-GDir *g_dir_open_utf8 (const gchar *path,
- guint flags,
- GError **error);
-GLIB_AVAILABLE_IN_ALL
-const gchar *g_dir_read_name_utf8 (GDir *dir);
-#endif /* G_OS_WIN32 */
-#endif /* __GTK_DOC_IGNORE__ */
-
G_END_DECLS
#endif /* __G_DIR_H__ */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]