From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Wed, 5 Dec 2018 13:59:17 +0000 (+0100)
Subject: Drop cmake variable DBUS_WIN_FIXME
X-Git-Tag: dbus-1.13.10~48^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ffcaede257e4c9d3906053f114c1a00d6348b870;p=thirdparty%2Fdbus.git

Drop cmake variable DBUS_WIN_FIXME
---

diff --git a/bus/dispatch.c b/bus/dispatch.c
index 414b64ab7..4ac93feae 100644
--- 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 6ca77675f..881dfa14c 100644
--- 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 c4cbd315b..16c20e831 100644
--- 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;