2006-12-13 Ralf Habacker <ralf.habacker@freenet.de>

	* dbus/dbus-internals.h: msvc also knows about __FUNCTION__,
	we should also use it. - Patch from Christian Ehrlicher

diff --git a/ChangeLog b/ChangeLog
index f1f9ed308f97cb91295bd7f74c530c12fdc7bd83..6d9f5ed9b427c41d53d64440e530e669f452eb9e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
+2006-12-13  Ralf Habacker  <ralf.habacker@freenet.de>
+
+       * dbus/dbus-internals.h: msvc also knows about __FUNCTION__, 
+       we should also use it. - Patch from Christian Ehrlicher
+
 2006-12-13  Ralf Habacker  <ralf.habacker@freenet.de>
   
-  * dbus-sysdeps-util.c: added win32 related tests
+       * dbus-sysdeps-util.c: added win32 related tests
 
 2006-12-12  Ralf Habacker  <ralf.habacker@freenet.de>
 

diff --git a/dbus/dbus-internals.h b/dbus/dbus-internals.h
index 750882b92b056ccd284ed1a3978def8338ba92e0..882d7aebbc764096311e63f4f2e4dbb2f4a1e08e 100644 (file)
--- a/dbus/dbus-internals.h
+++ b/dbus/dbus-internals.h
@@ -48,7 +48,7 @@ void _dbus_warn_check_failed  (const char *format,
 
 #if defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
 #define _DBUS_FUNCTION_NAME __func__
-#elif defined(__GNUC__)
+#elif defined(__GNUC__) || defined(_MSC_VER)
 #define _DBUS_FUNCTION_NAME __FUNCTION__
 #else
 #define _DBUS_FUNCTION_NAME "unknown function"