Drop cmake variable DBUS_WIN_FIXME

diff --git a/bus/dispatch.c b/bus/dispatch.c
index 414b64ab7c9df829b21c096c50e47192d6f8cfea..4ac93feaec33517fee1a0afb400cd4c3491e57ab 100644 (file)
--- a/bus/dispatch.c
+++ b/bus/dispatch.c
@@ -4939,7 +4939,7 @@ bus_dispatch_test_conf (const DBusString *test_data_dir,
     _dbus_test_fatal ("shell success service auto start failed");
   _dbus_test_ok ("%s:%s - check_shell_service_success_auto_start", _DBUS_FUNCTION_NAME, filename);
 
-#ifdef DBUS_WIN_FIXME
+#ifdef DBUS_WIN
   _dbus_verbose("TODO: Fix memory leaks after running check_shell_service_success_auto_start\n");
   _dbus_sleep_milliseconds (500);
 #endif

diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake
index 6ca77675f223a3ac0c081a83da5c34deb7dca534..881dfa14cd74fcc34cea5647f606a953eb2f2322 100644 (file)
--- a/cmake/config.h.cmake
+++ b/cmake/config.h.cmake
@@ -234,7 +234,6 @@
 // system type defines
 #if defined(_WIN32) || defined(_WIN64) || defined (_WIN32_WCE)
 # define DBUS_WIN
-# define DBUS_WIN_FIXME 1
 # ifdef _WIN32_WCE
 #  define DBUS_WINCE
 # else

diff --git a/dbus/dbus-memory.c b/dbus/dbus-memory.c
index c4cbd315b7b9c147911778bd34c8fb86fc6c2605..16c20e83144d7b223adcc89c5cf1b02801e99209 100644 (file)
--- a/dbus/dbus-memory.c
+++ b/dbus/dbus-memory.c
@@ -254,7 +254,7 @@ dbus_bool_t
 _dbus_decrement_fail_alloc_counter (void)
 {
   _dbus_initialize_malloc_debug ();
-#ifdef DBUS_WIN_FIXME
+#ifdef DBUS_WIN
   {
     static dbus_bool_t called = 0;