mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-01-27 14:36:16 +01:00
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.
This commit is contained in:
parent
82ab77c8f7
commit
50c62ba8a9
@ -1,3 +1,11 @@
|
||||
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.
|
||||
|
||||
2000-11-13 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
|
||||
|
||||
* gthread.c (g_static_rec_mutex_*): Made recursive mutexes also
|
||||
|
@ -1,3 +1,11 @@
|
||||
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.
|
||||
|
||||
2000-11-13 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
|
||||
|
||||
* gthread.c (g_static_rec_mutex_*): Made recursive mutexes also
|
||||
|
@ -1,3 +1,11 @@
|
||||
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.
|
||||
|
||||
2000-11-13 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
|
||||
|
||||
* gthread.c (g_static_rec_mutex_*): Made recursive mutexes also
|
||||
|
@ -1,3 +1,11 @@
|
||||
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.
|
||||
|
||||
2000-11-13 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
|
||||
|
||||
* gthread.c (g_static_rec_mutex_*): Made recursive mutexes also
|
||||
|
@ -1,3 +1,11 @@
|
||||
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.
|
||||
|
||||
2000-11-13 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
|
||||
|
||||
* gthread.c (g_static_rec_mutex_*): Made recursive mutexes also
|
||||
|
@ -1,3 +1,11 @@
|
||||
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.
|
||||
|
||||
2000-11-13 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
|
||||
|
||||
* gthread.c (g_static_rec_mutex_*): Made recursive mutexes also
|
||||
|
@ -1,3 +1,11 @@
|
||||
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.
|
||||
|
||||
2000-11-13 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
|
||||
|
||||
* gthread.c (g_static_rec_mutex_*): Made recursive mutexes also
|
||||
|
@ -1,3 +1,11 @@
|
||||
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.
|
||||
|
||||
2000-11-13 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
|
||||
|
||||
* gthread.c (g_static_rec_mutex_*): Made recursive mutexes also
|
||||
|
@ -144,3 +144,4 @@
|
||||
/* Define if you have the w library (-lw). */
|
||||
/* #undef HAVE_LIBW */
|
||||
|
||||
#define USE_LIBICONV 1
|
||||
|
@ -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);
|
||||
|
5
glib.def
5
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
|
||||
|
@ -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);
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user