diff options
| author | Tor Lillqvist <tml@iki.fi> | 2000-11-13 18:03:57 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2000-11-13 18:03:57 +0000 |
| commit | 50c62ba8a9e7b7954bad5ec1c1ce204fb58462c4 (patch) | |
| tree | ed3039fa172f1cec3a841cc33458d9b6a4fd4966 /glib | |
| parent | 82ab77c8f7b3f7969826ffc88c6349a5f7be9daf (diff) | |
| download | glib-50c62ba8a9e7b7954bad5ec1c1ce204fb58462c4.tar.gz | |
Add USE_LIBICONV.
2000-11-13 Tor Lillqvist <tml@iki.fi>
* config.h.win32.in: Add USE_LIBICONV.
* gconvert.c: Check G_OS_WIN32 only after including glib.h.
* glib.def: Update.
Diffstat (limited to 'glib')
| -rw-r--r-- | glib/gconvert.c | 7 | ||||
| -rw-r--r-- | glib/glib.def | 5 |
2 files changed, 9 insertions, 3 deletions
diff --git a/glib/gconvert.c b/glib/gconvert.c index da67e6ec2..d78c0a532 100644 --- a/glib/gconvert.c +++ b/glib/gconvert.c @@ -25,13 +25,13 @@ #include <string.h> #include <stdlib.h> +#include "glib.h" +#include "config.h" + #ifdef G_OS_WIN32 #include <windows.h> #endif -#include "glib.h" -#include "config.h" - #define _(s) (s) GQuark @@ -692,6 +692,7 @@ g_locale_from_utf8 (const gchar *utf8string, GError **error) gchar* g_filename_to_utf8 (const gchar *string, GError **error) + { #ifdef G_OS_WIN32 return g_locale_to_utf8 (string, error); diff --git a/glib/glib.def b/glib/glib.def index 41539a1fa..43290d226 100644 --- a/glib/glib.def +++ b/glib/glib.def @@ -151,6 +151,9 @@ EXPORTS g_hook_prepend g_hook_ref g_hook_unref + g_iconv + g_iconv_close + g_iconv_open g_idle_add g_idle_add_full g_idle_remove_by_data @@ -202,6 +205,8 @@ EXPORTS g_list_remove_link g_list_reverse g_list_sort + g_locale_from_utf8 + g_locale_to_utf8 g_log g_log_default_handler g_log_remove_handler |