[zbar-commits] push rev [277]: Avoid dprintf conflict.

[<tte...@us...>]

changeset: 277:e0d80fc5de48
user:      tte...@us...
date:      Thu Dec 09 12:40:16 2010 -0800
details:   http://zbar.hg.sourceforge.net:8000/hgroot/zbar/zbarzbar/rev/e0d80fc5de48
description:
Avoid dprintf conflict.

dprintf is part of XPG7 (X/Open 2008), but zbar #defines a conflicting
 one to use for debug printing.
This just makes sure <stdio.h> is included before the macro is defined,
 so that the declaration in that header is processed before zbar's
 macro.
Fixes issue 3122916:
 http://sourceforge.net/tracker/?func=detail&atid=928516&aid=3122916&group_id=189236

diffstat:

 zbar/debug.h |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (21 lines):

diff -r f36974fe2b4b -r e0d80fc5de48 zbar/debug.h
--- a/zbar/debug.h	Thu Dec 09 12:17:27 2010 -0800
+++ b/zbar/debug.h	Thu Dec 09 12:40:16 2010 -0800
@@ -23,6 +23,8 @@
 
 /* varargs variations on compile time debug spew */
 
+# include <stdio.h>
+
 #ifndef DEBUG_LEVEL
 
 # ifdef __GNUC__
@@ -35,8 +37,6 @@
 
 #else
 
-# include <stdio.h>
-
 # ifdef __GNUC__
 #  define dprintf(level, args...) do {  \
         if((level) <= DEBUG_LEVEL)      \