diff options
| author | Christoph Reiter <creiter@src.gnome.org> | 2017-03-28 07:59:09 +0200 |
|---|---|---|
| committer | Christoph Reiter <creiter@src.gnome.org> | 2017-04-06 19:17:03 +0200 |
| commit | 713788413d826fc9154abb82fb2cd174f7fabf43 (patch) | |
| tree | 1943095ee0519242d7961a244a9a5ad8be088269 /glib/gconvert.h | |
| parent | feae4e9f3184e0c59e658652c1b0ec31efe8d8b3 (diff) | |
| download | glib-713788413d826fc9154abb82fb2cd174f7fabf43.tar.gz | |
gconvert: 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
Diffstat (limited to 'glib/gconvert.h')
| -rw-r--r-- | glib/gconvert.h | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/glib/gconvert.h b/glib/gconvert.h index ba82a65e9..c2419415d 100644 --- a/glib/gconvert.h +++ b/glib/gconvert.h @@ -166,36 +166,6 @@ gchar *g_filename_display_basename (const gchar *filename) G_GNUC_MALLOC; GLIB_AVAILABLE_IN_ALL gchar **g_uri_list_extract_uris (const gchar *uri_list) G_GNUC_MALLOC; -#ifndef __GTK_DOC_IGNORE__ -#ifdef G_OS_WIN32 -#define g_filename_to_utf8 g_filename_to_utf8_utf8 -#define g_filename_from_utf8 g_filename_from_utf8_utf8 -#define g_filename_from_uri g_filename_from_uri_utf8 -#define g_filename_to_uri g_filename_to_uri_utf8 - -GLIB_AVAILABLE_IN_ALL -gchar* g_filename_to_utf8_utf8 (const gchar *opsysstring, - gssize len, - gsize *bytes_read, - gsize *bytes_written, - GError **error) G_GNUC_MALLOC; -GLIB_AVAILABLE_IN_ALL -gchar* g_filename_from_utf8_utf8 (const gchar *utf8string, - gssize len, - gsize *bytes_read, - gsize *bytes_written, - GError **error) G_GNUC_MALLOC; -GLIB_AVAILABLE_IN_ALL -gchar *g_filename_from_uri_utf8 (const gchar *uri, - gchar **hostname, - GError **error) G_GNUC_MALLOC; -GLIB_AVAILABLE_IN_ALL -gchar *g_filename_to_uri_utf8 (const gchar *filename, - const gchar *hostname, - GError **error) G_GNUC_MALLOC; -#endif -#endif /* __GTK_DOC_IGNORE__ */ - G_END_DECLS #endif /* __G_CONVERT_H__ */ |