Merge branch 'master' of git://git.netsurf-browser.org/netsurf

This commit is contained in:
Rob Kendrick (fatigue) 2012-11-05 16:07:59 +00:00
commit 36f23e424e
2 changed files with 11 additions and 11 deletions

View File

@ -109,15 +109,13 @@ const char *nslog_gettime(void)
void nslog_log(const char *format, ...)
{
if (verbose_log) {
va_list ap;
va_list ap;
va_start(ap, format);
va_start(ap, format);
vfprintf(stderr, format, ap);
vfprintf(stderr, format, ap);
va_end(ap);
}
va_end(ap);
}
#endif

View File

@ -64,11 +64,13 @@ extern void nslog_log(const char *format, ...);
# endif
#define LOG(x) \
do { \
nslog_log("%s " __FILE__ " %s %i: ", \
nslog_gettime(), LOG_FN, LOG_LN); \
nslog_log x; \
nslog_log("\n"); \
do { \
if (verbose_log) { \
nslog_log("%s " __FILE__ " %s %i: ", \
nslog_gettime(), LOG_FN, LOG_LN); \
nslog_log x; \
nslog_log("\n"); \
} \
} while(0)
#endif