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.

13 files changed, 83 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 465e222cc..4d0048487 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 465e222cc..4d0048487 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -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
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 465e222cc..4d0048487 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -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
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 465e222cc..4d0048487 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -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
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 465e222cc..4d0048487 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -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
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 465e222cc..4d0048487 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -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
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 465e222cc..4d0048487 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -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
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 465e222cc..4d0048487 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -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
diff --git a/config.h.win32.in b/config.h.win32.in
index b06c600b5..6beceb866 100644
--- a/config.h.win32.in
+++ b/config.h.win32.in
@@ -144,3 +144,4 @@
 /* Define if you have the w library (-lw).  */
 /* #undef HAVE_LIBW */
 
+#define USE_LIBICONV 1
diff --git a/gconvert.c b/gconvert.c
index da67e6ec2..d78c0a532 100644
--- a/gconvert.c
+++ b/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.def b/glib.def
index 41539a1fa..43290d226 100644
--- a/glib.def
+++ b/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
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