Do not print DPRINT1s on retail builds Modified: trunk/reactos/include/debug.h Modified: trunk/reactos/include/ntdll/ntdll.h Modified: trunk/reactos/include/win32k/debug1.h Modified: trunk/reactos/include/wine/debug.h _____
Modified: trunk/reactos/include/debug.h --- trunk/reactos/include/debug.h 2005-05-26 13:47:21 UTC (rev 15515) +++ trunk/reactos/include/debug.h 2005-05-26 13:48:55 UTC (rev 15516) @@ -48,12 +48,20 @@
#endif #endif
- /* TODO: Make the output of file/line and the debug message atomic */ +#ifdef DBG #define DPRINT1 DbgPrint("(%s:%d) ",__FILE__,__LINE__), DbgPrint #define CHECKPOINT1 do { DbgPrint("%s:%d\n",__FILE__,__LINE__); } while(0); +#else +#ifdef __GNUC__ +#define DPRINT1(args...) +#define CHECKPOINT1 +#else +#define DPRINT1 +#define CHECKPOINT1 +#endif /* __GNUC__ */ +#endif
- #ifndef NDEBUG #define DPRINT(args...) do { DbgPrint("(%s:%d) ",__FILE__,__LINE__); DbgPrint(args); } while(0); #define CHECKPOINT do { DbgPrint("%s:%d\n",__FILE__,__LINE__); } while(0); _____
Modified: trunk/reactos/include/ntdll/ntdll.h --- trunk/reactos/include/ntdll/ntdll.h 2005-05-26 13:47:21 UTC (rev 15515) +++ trunk/reactos/include/ntdll/ntdll.h 2005-05-26 13:48:55 UTC (rev 15516) @@ -29,12 +29,17 @@
#define CHECKPOINT do { DbgPrint("(NTDLL:%s:%d) Checkpoint\n",__FILE__,__LINE__); } while(0) #endif
+#ifdef DBG #if defined(__GNUC__) #define DPRINT1(args...) do { DbgPrint("(NTDLL:%s:%d) ",__FILE__,__LINE__); DbgPrint(args); } while(0) #else #define DPRINT1 DbgPrint("(NTDLL:%s:%d) ",__FILE__,__LINE__); DbgPrint #endif #define CHECKPOINT1 do { DbgPrint("(NTDLL:%s:%d) Checkpoint\n",__FILE__,__LINE__); } while(0) +#else +#define DPRINT1(args...) +#define CHECKPOINT1(args...) +#endif
#define ROUNDUP(a,b) ((((a)+(b)-1)/(b))*(b)) #define ROUNDDOWN(a,b) (((a)/(b))*(b)) _____
Modified: trunk/reactos/include/win32k/debug1.h --- trunk/reactos/include/win32k/debug1.h 2005-05-26 13:47:21 UTC (rev 15515) +++ trunk/reactos/include/win32k/debug1.h 2005-05-26 13:48:55 UTC (rev 15516) @@ -39,10 +39,14 @@
#endif #endif
+#ifdef DBG #define DPRINT1 DbgPrint("(%s:%d) ",__FILE__,__LINE__), DbgPrint #define CHECKPOINT1 DbgPrint("%s:%d\n",__FILE__,__LINE__); +#else +#define DPRINT1(args...) +#define CHECKPOINT1(args...) +#endif
- #ifdef __NTOSKRNL__ #define DPRINT_CHECKS #else _____
Modified: trunk/reactos/include/wine/debug.h --- trunk/reactos/include/wine/debug.h 2005-05-26 13:47:21 UTC (rev 15515) +++ trunk/reactos/include/wine/debug.h 2005-05-26 13:48:55 UTC (rev 15516) @@ -12,7 +12,11 @@
unsigned long DbgPrint(char *Format,...);
+#if DBG #define DPRINT1 DbgPrint("(%s:%d:%s) ",__FILE__,__LINE__,__FUNCTION__), DbgPrint +#else +#define DPRINT1(args...) +#endif
#if !defined(DBG) || !defined(YDEBUG) #ifdef __GNUC__