newer msvc's are aware of __FUNCTION__

[reactos.git] / reactos / include / wine / debug.h

diff --git a/reactos/include/wine/debug.h b/reactos/include/wine/debug.h
index 465f9fa..80f7ca0 100644 (file)
--- a/reactos/include/wine/debug.h
+++ b/reactos/include/wine/debug.h
@@ -6,28 +6,25 @@
 #include <windows.h>
 #include <wchar.h>
 
+/* Add ROS Master debug functions if not added yet */
+#ifndef __INTERNAL_DEBUG
+#ifdef YDEBUG
+#undef NDEBUG
+#else
+#define NDEBUG
+#endif
+#include <reactos/debug.h>
+#endif
+
 #ifndef __GNUC__
+#if !defined(_MSC_VER) || _MSC_VER < 8
 #define        __FUNCTION__ ""
+#endif//_MSC_VER
 #define        inline __inline
 #endif
 
 unsigned long DbgPrint(char *Format,...);
 
-#ifdef DBG
-#define DPRINT1 DbgPrint("(%s:%d:%s) ",__FILE__,__LINE__,__FUNCTION__), DbgPrint
-#else
-#define DPRINT1(args...)
-#endif
-
-#if !defined(DBG) || !defined(YDEBUG)
-#define DPRINT(...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0)
-#else
-#define DPRINT DbgPrint("(%s:%d:%s) ",__FILE__,__LINE__,__FUNCTION__), DbgPrint
-#endif
-
-#define UNIMPLEMENTED   DbgPrint("WARNING:  %s at %s:%d is UNIMPLEMENTED!\n",__FUNCTION__,__FILE__,__LINE__);
-
-
 struct _GUID;
 
 /* Exported definitions and macros */
@@ -35,6 +32,7 @@ struct _GUID;
 /* These function return a printable version of a string, including
    quotes.  The string will be valid for some time, but not indefinitely
    as strings are re-used.  */
+extern const char *wine_dbgstr_w( const WCHAR *s );
 extern const char *wine_dbgstr_an( const char * s, int n );
 extern const char *wine_dbgstr_wn( const wchar_t *s, int n );
 extern const char *wine_dbgstr_guid( const struct _GUID *id );