[ros-diffs] [fireball] 20705: Merge r20642

[fireball at svn.reactos.org]

Merge r20642
Modified: branches/usb2_6/reactos/include/reactos/debug.h
  _____  

Modified: branches/usb2_6/reactos/include/reactos/debug.h
--- branches/usb2_6/reactos/include/reactos/debug.h	2006-01-08
10:09:23 UTC (rev 20704)
+++ branches/usb2_6/reactos/include/reactos/debug.h	2006-01-08
10:14:14 UTC (rev 20705)
@@ -82,7 +82,12 @@

         #define CHECKPOINT do { DbgPrint("%s:%d\n",__FILE__,__LINE__);
} while(0);
     
     #else
-        #ifdef __GNUC__
+        #ifdef _MSC_VER
+            static __inline void DPRINT ( const char* fmt, ... )
+            {
+                UNREFERENCED_PARAMETER(fmt);
+            }
+        #else
             #define DPRINT(...) do { if(0) { DbgPrint(__VA_ARGS__); } }
while(0)
         #endif
         #define CHECKPOINT
@@ -94,17 +99,18 @@
 #else
 
     /* On non-debug builds, we never show these */
-#ifdef _MSC_VER
-static __inline void DPRINT1 ( const char* fmt, ... )
-{
-}
-static __inline void DPRINT ( const char* fmt, ... )
-{
-}
-#else
-    #define DPRINT1(...) do { if(0) { DbgPrint(__VA_ARGS__); } }
while(0)
-    #define DPRINT(...) do { if(0) { DbgPrint(__VA_ARGS__); } }
while(0)
-#endif
+    #ifdef _MSC_VER
+        static __inline void DPRINT1 ( const char* fmt, ... )
+        {
+        }
+        static __inline void DPRINT ( const char* fmt, ... )
+        {
+        }
+    #else
+        #define DPRINT1(...) do { if(0) { DbgPrint(__VA_ARGS__); } }
while(0)
+        #define DPRINT(...) do { if(0) { DbgPrint(__VA_ARGS__); } }
while(0)
+    #endif
+
     #define CHECKPOINT1
     #define CHECKPOINT
     #define UNIMPLEMENTED
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://www.reactos.org/pipermail/ros-diffs/attachments/20060108/d506b342/attachment.html