get_filename_charset() needs to return false for filenames not encoded in

2003-12-13  Hans Breuer  <hans@breuer.org>

	* glib/gconvert.c : get_filename_charset() needs to
	return false for filenames not encoded in utf-8,
	which is always true on win32

	* glibconfig.h.win32.in : (u)int64 modifier isn't the
	gcc 'll' but always the msvcrt one 'I64'

	* glib/glib.def : updated

ChangeLog

@@ -1,3 +1,14 @@
+2003-12-13  Hans Breuer  <hans@breuer.org>
+
+	* glib/gconvert.c : get_filename_charset() needs to
+	return false for filenames not encoded in utf-8, 
+	which is always true on win32
+
+	* glibconfig.h.win32.in : (u)int64 modifier isn't the
+	gcc 'll' but always the msvcrt one 'I64'
+
+	* glib/glib.def : updated
+
 Thu Dec 11 10:31:21 2003  Manish Singh  <yosh@gimp.org>
 
 	* glib/gmacros.h: change #elif with no expression to #else in

ChangeLog.pre-2-10

@@ -1,3 +1,14 @@
+2003-12-13  Hans Breuer  <hans@breuer.org>
+
+	* glib/gconvert.c : get_filename_charset() needs to
+	return false for filenames not encoded in utf-8, 
+	which is always true on win32
+
+	* glibconfig.h.win32.in : (u)int64 modifier isn't the
+	gcc 'll' but always the msvcrt one 'I64'
+
+	* glib/glib.def : updated
+
 Thu Dec 11 10:31:21 2003  Manish Singh  <yosh@gimp.org>
 
 	* glib/gmacros.h: change #elif with no expression to #else in

ChangeLog.pre-2-12

@@ -1,3 +1,14 @@
+2003-12-13  Hans Breuer  <hans@breuer.org>
+
+	* glib/gconvert.c : get_filename_charset() needs to
+	return false for filenames not encoded in utf-8, 
+	which is always true on win32
+
+	* glibconfig.h.win32.in : (u)int64 modifier isn't the
+	gcc 'll' but always the msvcrt one 'I64'
+
+	* glib/glib.def : updated
+
 Thu Dec 11 10:31:21 2003  Manish Singh  <yosh@gimp.org>
 
 	* glib/gmacros.h: change #elif with no expression to #else in

ChangeLog.pre-2-4

@@ -1,3 +1,14 @@
+2003-12-13  Hans Breuer  <hans@breuer.org>
+
+	* glib/gconvert.c : get_filename_charset() needs to
+	return false for filenames not encoded in utf-8, 
+	which is always true on win32
+
+	* glibconfig.h.win32.in : (u)int64 modifier isn't the
+	gcc 'll' but always the msvcrt one 'I64'
+
+	* glib/glib.def : updated
+
 Thu Dec 11 10:31:21 2003  Manish Singh  <yosh@gimp.org>
 
 	* glib/gmacros.h: change #elif with no expression to #else in

ChangeLog.pre-2-6

@@ -1,3 +1,14 @@
+2003-12-13  Hans Breuer  <hans@breuer.org>
+
+	* glib/gconvert.c : get_filename_charset() needs to
+	return false for filenames not encoded in utf-8, 
+	which is always true on win32
+
+	* glibconfig.h.win32.in : (u)int64 modifier isn't the
+	gcc 'll' but always the msvcrt one 'I64'
+
+	* glib/glib.def : updated
+
 Thu Dec 11 10:31:21 2003  Manish Singh  <yosh@gimp.org>
 
 	* glib/gmacros.h: change #elif with no expression to #else in

ChangeLog.pre-2-8

@@ -1,3 +1,14 @@
+2003-12-13  Hans Breuer  <hans@breuer.org>
+
+	* glib/gconvert.c : get_filename_charset() needs to
+	return false for filenames not encoded in utf-8, 
+	which is always true on win32
+
+	* glibconfig.h.win32.in : (u)int64 modifier isn't the
+	gcc 'll' but always the msvcrt one 'I64'
+
+	* glib/glib.def : updated
+
 Thu Dec 11 10:31:21 2003  Manish Singh  <yosh@gimp.org>
 
 	* glib/gmacros.h: change #elif with no expression to #else in

glib/gconvert.c

@@ -1088,7 +1088,12 @@ get_filename_charset (const gchar **filename_charset)
 }
 
 #else /* G_PLATFORM_WIN32 */
-#define get_filename_charset (charset) TRUE
+static gboolean
+get_filename_charset (const gchar **filename_charset) 
+{
+  g_get_charset (filename_charset);
+  return FALSE;
+}
 #endif /* G_PLATFORM_WIN32 */
 
 /* This is called from g_thread_init(). It's used to

glib/makefile.msc.in

@@ -29,7 +29,6 @@ glib_OBJECTS =			\
 	garray.obj		\
 	gasyncqueue.obj		\
 	gbacktrace.obj		\
-	gbsearcharray.obj	\
 	gcache.obj		\
 	gcompletion.obj		\
 	gconvert.obj		\

glibconfig.h.win32.in

@@ -59,9 +59,9 @@ typedef unsigned __int64 guint64;
 #else /* _MSC_VER */
 #define G_GINT64_CONSTANT(val)	(val##i64)
 #endif /* _MSC_VER */
-#define G_GINT64_MODIFIER "ll"
+#define G_GINT64_MODIFIER "I64"
-#define G_GINT64_FORMAT "lli"
+#define G_GINT64_FORMAT "I64i"
-#define G_GUINT64_FORMAT "llu"
+#define G_GUINT64_FORMAT "I64u"
 
 #define GLIB_SIZEOF_VOID_P 4
 #define GLIB_SIZEOF_LONG   4