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

diff --git a/ChangeLog b/ChangeLog
index 11b1e31..5254168 100644 (file)
--- a/ChangeLog
+++ b/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

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 11b1e31..5254168 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/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

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 11b1e31..5254168 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/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

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 11b1e31..5254168 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/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

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 11b1e31..5254168 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/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

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 11b1e31..5254168 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/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

diff --git a/glib/gconvert.c b/glib/gconvert.c
index 4f85a0b..f504c6f 100644 (file)
--- a/glib/gconvert.c
+++ b/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

diff --git a/glib/makefile.msc.in b/glib/makefile.msc.in
index abf01fc..203681d 100644 (file)
--- a/glib/makefile.msc.in
+++ b/glib/makefile.msc.in
@@ -29,7 +29,6 @@ glib_OBJECTS =                        \
        garray.obj              \
        gasyncqueue.obj         \
        gbacktrace.obj          \
-       gbsearcharray.obj       \
        gcache.obj              \
        gcompletion.obj         \
        gconvert.obj            \

diff --git a/glibconfig.h.win32.in b/glibconfig.h.win32.in
index 704b691..6ef7415 100644 (file)
--- a/glibconfig.h.win32.in
+++ b/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_FORMAT "lli"
-#define G_GUINT64_FORMAT "llu"
+#define G_GINT64_MODIFIER "I64"
+#define G_GINT64_FORMAT "I64i"
+#define G_GUINT64_FORMAT "I64u"
 
 #define GLIB_SIZEOF_VOID_P 4
 #define GLIB_SIZEOF_LONG   4