summaryrefslogtreecommitdiffstats
path: root/dbus
diff options
context:
space:
mode:
Diffstat (limited to 'dbus')
-rw-r--r--dbus/dbus-sysdeps-util.c3
-rw-r--r--dbus/dbus-watch.c4
2 files changed, 1 insertions, 6 deletions
diff --git a/dbus/dbus-sysdeps-util.c b/dbus/dbus-sysdeps-util.c
index c5aecb95..1f6ceb9b 100644
--- a/dbus/dbus-sysdeps-util.c
+++ b/dbus/dbus-sysdeps-util.c
@@ -141,7 +141,6 @@ _dbus_sysdeps_test (void)
exit (1);
}
-#ifndef DBUS_WIN
_dbus_string_init_const (&str, "0xff");
if (!_dbus_string_parse_double (&str,
0, &val, &pos))
@@ -159,7 +158,7 @@ _dbus_sysdeps_test (void)
_dbus_warn ("_dbus_string_parse_double of \"0xff\" returned wrong position %d", pos);
exit (1);
}
-#endif
+
#ifdef DBUS_WIN
check_path_absolute ("c:/", TRUE);
check_path_absolute ("c:/foo", TRUE);
diff --git a/dbus/dbus-watch.c b/dbus/dbus-watch.c
index 634ab247..eed9a105 100644
--- a/dbus/dbus-watch.c
+++ b/dbus/dbus-watch.c
@@ -489,11 +489,7 @@ _dbus_watch_set_handler (DBusWatch *watch,
int
dbus_watch_get_fd (DBusWatch *watch)
{
-#ifdef DBUS_WIN_FIXME
- return watch->fd;
-#else
return dbus_watch_get_unix_fd(watch);
-#endif
}
/**