Gitweb links: ...log http://git.netsurf-browser.org/libnslog.git/shortlog/00ea402050da45943b1c... ...commit http://git.netsurf-browser.org/libnslog.git/commit/00ea402050da45943b1cf1... ...tree http://git.netsurf-browser.org/libnslog.git/tree/00ea402050da45943b1cf1c1... The branch, master has been updated via 00ea402050da45943b1cf1c11d7ac4e1ddbfa489 (commit) from 8904c4e51359fde76735636903bd5f6d826f193d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/libnslog.git/commit/?id=00ea402050da45943b... commit 00ea402050da45943b1cf1c11d7ac4e1ddbfa489 Author: Daniel Silverstone <dsilvers(a)digital-scurf.org&gt; Commit: Daniel Silverstone <dsilvers(a)digital-scurf.org&gt; Don't stomp on 'ctx' in logging macro diff --git a/include/nslog/nslog.h b/include/nslog/nslog.h index 045914c..0288f5d 100644 --- a/include/nslog/nslog.h +++ b/include/nslog/nslog.h @@ -173,7 +173,7 @@ typedef struct nslog_entry_context_s { #define NSLOG(catname, level, logmsg, args...) \ do { \ if (NSLOG_LEVEL_##level >= NSLOG_COMPILED_MIN_LEVEL) { \ - static nslog_entry_context_t ctx = { \ + static nslog_entry_context_t _nslog_ctx = { \ &__nslog_category_##catname, \ NSLOG_LEVEL_##level, \ __FILE__, \ @@ -182,7 +182,7 @@ typedef struct nslog_entry_context_s { sizeof(__PRETTY_FUNCTION__) - 1, \ __LINE__, \ }; \ - nslog__log(&ctx, logmsg, ##args); \ + nslog__log(&_nslog_ctx, logmsg, ##args); \ } \ } while(0) ----------------------------------------------------------------------- Summary of changes: include/nslog/nslog.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/nslog/nslog.h b/include/nslog/nslog.h index 045914c..0288f5d 100644 --- a/include/nslog/nslog.h +++ b/include/nslog/nslog.h @@ -173,7 +173,7 @@ typedef struct nslog_entry_context_s { #define NSLOG(catname, level, logmsg, args...) \ do { \ if (NSLOG_LEVEL_##level >= NSLOG_COMPILED_MIN_LEVEL) { \ - static nslog_entry_context_t ctx = { \ + static nslog_entry_context_t _nslog_ctx = { \ &__nslog_category_##catname, \ NSLOG_LEVEL_##level, \ __FILE__, \ @@ -182,7 +182,7 @@ typedef struct nslog_entry_context_s { sizeof(__PRETTY_FUNCTION__) - 1, \ __LINE__, \ }; \ - nslog__log(&ctx, logmsg, ##args); \ + nslog__log(&_nslog_ctx, logmsg, ##args); \ } \ } while(0) -- NetSurf Parametric Logging Library