--- np2/x11/trace.h	2003/10/16 17:59:41	1.1.1.1
+++ np2/x11/trace.h	2011/01/15 19:16:58	1.7
@@ -1,29 +1,34 @@
+#ifndef	NP2_X11_TRACE_H__
+#define	NP2_X11_TRACE_H__
+
+G_BEGIN_DECLS
+
+extern int trace_flag;
+
+void trace_init(void);
+void trace_term(void);
+void trace_fmt(const char *str, ...) G_GNUC_PRINTF(1, 2);
 
 #ifndef TRACE
 
 #define	TRACEINIT()
 #define	TRACETERM()
 #define	TRACEOUT(a)
-#define	VERBOSE(a)
-
-#else
-
-#ifdef	__cplusplus
-extern "C" {
+#ifndef	VERBOSE
+#define	VERBOSE(s)
 #endif
 
-void trace_init(void);
-void trace_term(void);
-void trace_fmt(const char *str, ...);
+#else	/* TRACE */
 
-#define	TRACEINIT()		trace_init()
-#define	TRACETERM()		trace_term()
+#define	TRACEINIT()	trace_init()
+#define	TRACETERM()	trace_term()
 #define	TRACEOUT(arg)	trace_fmt arg
-#define	VERBOSE(arg)	trace_fmt arg
-
-#ifdef	__cplusplus
-};
+#ifndef	VERBOSE
+#define	VERBOSE(arg)	if (trace_flag) trace_fmt arg
 #endif
 
-#endif
+#endif	/* !TRACE */
+
+G_END_DECLS
 
+#endif	/* NP2_X11_TRACE_H__ */