From 5c38cfa58d8de900b97206f53502912ff145754a Mon Sep 17 00:00:00 2001 From: Manish Singh Date: Mon, 25 Oct 2004 22:08:37 +0000 Subject: [PATCH] rm autom4te.cache, since it might interfere with differing autoconf Mon Oct 25 15:05:18 2004 Manish Singh * 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. --- ChangeLog | 11 +++++++++++ ChangeLog.pre-2-10 | 11 +++++++++++ ChangeLog.pre-2-12 | 11 +++++++++++ ChangeLog.pre-2-6 | 11 +++++++++++ ChangeLog.pre-2-8 | 11 +++++++++++ autogen.sh | 2 ++ glib/gfileutils.c | 6 ------ tests/child-test.c | 6 ++++-- 8 files changed, 61 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 519acc6..8bee809 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +Mon Oct 25 15:05:18 2004 Manish Singh + + * 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 * glib/gkeyfile.c (g_key_file_remove_group_node): Don't diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 519acc6..8bee809 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,14 @@ +Mon Oct 25 15:05:18 2004 Manish Singh + + * 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 * glib/gkeyfile.c (g_key_file_remove_group_node): Don't diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 519acc6..8bee809 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,14 @@ +Mon Oct 25 15:05:18 2004 Manish Singh + + * 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 * glib/gkeyfile.c (g_key_file_remove_group_node): Don't diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 519acc6..8bee809 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,14 @@ +Mon Oct 25 15:05:18 2004 Manish Singh + + * 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 * glib/gkeyfile.c (g_key_file_remove_group_node): Don't diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 519acc6..8bee809 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,14 @@ +Mon Oct 25 15:05:18 2004 Manish Singh + + * 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 * glib/gkeyfile.c (g_key_file_remove_group_node): Don't diff --git a/autogen.sh b/autogen.sh index 527eb3c..cd2f89c 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 da6533e..f0f7528 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 37296b4..24227ac 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); -- 2.7.4