diff --git a/ChangeLog b/ChangeLog
index 519acc650..8bee809a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Mon Oct 25 15:05:18 2004  Manish Singh  <yosh@gimp.org>
+
+	* autogen.sh: rm autom4te.cache, since it might interfere with
+	differing autoconf versions.
+
+	* tests/child-test.c: use GINT_TO_POINTER for g_child_watch_add
+	user data.
+
+	* glib/gfileutils.c: G_IS_DIR_SEPARATOR is defined in gutils.h now,
+	don't redefine it here.
+
 2004-10-24  Matthias Clasen  <mclasen@redhat.com>
 
 	* glib/gkeyfile.c (g_key_file_remove_group_node): Don't
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 519acc650..8bee809a7 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,14 @@
+Mon Oct 25 15:05:18 2004  Manish Singh  <yosh@gimp.org>
+
+	* autogen.sh: rm autom4te.cache, since it might interfere with
+	differing autoconf versions.
+
+	* tests/child-test.c: use GINT_TO_POINTER for g_child_watch_add
+	user data.
+
+	* glib/gfileutils.c: G_IS_DIR_SEPARATOR is defined in gutils.h now,
+	don't redefine it here.
+
 2004-10-24  Matthias Clasen  <mclasen@redhat.com>
 
 	* glib/gkeyfile.c (g_key_file_remove_group_node): Don't
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 519acc650..8bee809a7 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,14 @@
+Mon Oct 25 15:05:18 2004  Manish Singh  <yosh@gimp.org>
+
+	* autogen.sh: rm autom4te.cache, since it might interfere with
+	differing autoconf versions.
+
+	* tests/child-test.c: use GINT_TO_POINTER for g_child_watch_add
+	user data.
+
+	* glib/gfileutils.c: G_IS_DIR_SEPARATOR is defined in gutils.h now,
+	don't redefine it here.
+
 2004-10-24  Matthias Clasen  <mclasen@redhat.com>
 
 	* glib/gkeyfile.c (g_key_file_remove_group_node): Don't
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 519acc650..8bee809a7 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,14 @@
+Mon Oct 25 15:05:18 2004  Manish Singh  <yosh@gimp.org>
+
+	* autogen.sh: rm autom4te.cache, since it might interfere with
+	differing autoconf versions.
+
+	* tests/child-test.c: use GINT_TO_POINTER for g_child_watch_add
+	user data.
+
+	* glib/gfileutils.c: G_IS_DIR_SEPARATOR is defined in gutils.h now,
+	don't redefine it here.
+
 2004-10-24  Matthias Clasen  <mclasen@redhat.com>
 
 	* glib/gkeyfile.c (g_key_file_remove_group_node): Don't
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 519acc650..8bee809a7 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,14 @@
+Mon Oct 25 15:05:18 2004  Manish Singh  <yosh@gimp.org>
+
+	* autogen.sh: rm autom4te.cache, since it might interfere with
+	differing autoconf versions.
+
+	* tests/child-test.c: use GINT_TO_POINTER for g_child_watch_add
+	user data.
+
+	* glib/gfileutils.c: G_IS_DIR_SEPARATOR is defined in gutils.h now,
+	don't redefine it here.
+
 2004-10-24  Matthias Clasen  <mclasen@redhat.com>
 
 	* glib/gkeyfile.c (g_key_file_remove_group_node): Don't
diff --git a/autogen.sh b/autogen.sh
index 527eb3c74..cd2f89ca1 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -72,6 +72,8 @@ if test -z "$AUTOGEN_SUBDIR_MODE"; then
         fi
 fi
 
+rm -rf autom4te.cache
+
 $ACLOCAL $ACLOCAL_FLAGS || exit $?
 
 libtoolize --force || exit $?
diff --git a/glib/gfileutils.c b/glib/gfileutils.c
index da6533e84..f0f7528c2 100644
--- a/glib/gfileutils.c
+++ b/glib/gfileutils.c
@@ -65,12 +65,6 @@
 
 #include "glibintl.h"
 
-#ifdef G_OS_WIN32
-#define G_IS_DIR_SEPARATOR(c) (c == G_DIR_SEPARATOR || c == '/')
-#else
-#define G_IS_DIR_SEPARATOR(c) (c == G_DIR_SEPARATOR)
-#endif
-
 /**
  * g_file_test:
  * @filename: a filename to test
diff --git a/tests/child-test.c b/tests/child-test.c
index 37296b46e..24227acbc 100644
--- a/tests/child-test.c
+++ b/tests/child-test.c
@@ -169,9 +169,11 @@ main (int argc, char *argv[])
   g_thread_create (test_thread, GINT_TO_POINTER (20), FALSE, NULL);
 #else
   pid = get_a_child (10);
-  g_child_watch_add (pid, child_watch_callback, GINT_TO_POINTER (10));
+  g_child_watch_add (pid, (GChildWatchFunc) child_watch_callback,
+		     GINT_TO_POINTER (10));
   pid = get_a_child (20);
-  g_child_watch_add (pid, child_watch_callback, GINT_TO_POINTER (20));
+  g_child_watch_add (pid, (GChildWatchFunc) child_watch_callback,
+		     GINT_TO_POINTER (20));
 #endif
   
   g_main_loop_run (main_loop);