summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--bus/dir-watch-dnotify.c6
-rw-r--r--configure.in5
3 files changed, 15 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index c6d5b3d9..f33eb93d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2006-08-10 John (J5) Palmieri <johnp@redhat.com>
+ * configure.in: make sure the compiler supports -Wfloat-equal
+
+ * bus/dir-watch-dnotify.c: move functional code after
+ variable declerations (C99 fix) (patches from Jens Granseuer
+ <jensgr at gmx dot net>
+
+2006-08-10 John (J5) Palmieri <johnp@redhat.com>
+
* dbus/dbus-macros.h:
add #include <stddef.h> so that Sun compilers don't complain about
the defining NULL
diff --git a/bus/dir-watch-dnotify.c b/bus/dir-watch-dnotify.c
index 64cfc74d..87e32761 100644
--- a/bus/dir-watch-dnotify.c
+++ b/bus/dir-watch-dnotify.c
@@ -74,10 +74,10 @@ bus_watch_directory (const char *dir, void *userdata)
void
bus_drop_all_directory_watches (void)
{
- _dbus_verbose ("Dropping all watches on config directories\n");
-
int i;
-
+
+ _dbus_verbose ("Dropping all watches on config directories\n");
+
for (i = 0; i < num_fds; i++)
{
if (close (fds[i]) != 0)
diff --git a/configure.in b/configure.in
index a411262e..48382b56 100644
--- a/configure.in
+++ b/configure.in
@@ -146,7 +146,10 @@ if test "x$GCC" = "xyes"; then
case " $CFLAGS " in
*[\ \ ]-Wfloat-equal[\ \ ]*) ;;
- *) CFLAGS="$CFLAGS -Wfloat-equal" ;;
+ *) if cc_supports_flag -Wfloat-equals; then
+ CFLAGS="$CFLAGS -Wfloat-equal"
+ fi
+ ;;
esac
case " $CFLAGS " in