You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by nw...@apache.org on 2016/06/01 11:04:48 UTC
lucy-clownfish git commit: Fix DECREF name clash under MinGW
Repository: lucy-clownfish
Updated Branches:
refs/heads/0.5 680006267 -> 3aeccac66
Fix DECREF name clash under MinGW
MinGW's winnt.h also defines DECREF.
Also fix unused variable warnings in the Windows TLS code.
Fixes CLOWNFISH-101.
Project: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/commit/3aeccac6
Tree: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/tree/3aeccac6
Diff: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/diff/3aeccac6
Branch: refs/heads/0.5
Commit: 3aeccac669c27f59af690c9d8cff1d920f63a6ab
Parents: 68000626
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Sat May 21 01:54:36 2016 +0200
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Wed Jun 1 13:03:36 2016 +0200
----------------------------------------------------------------------
runtime/c/src/tls.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/3aeccac6/runtime/c/src/tls.c
----------------------------------------------------------------------
diff --git a/runtime/c/src/tls.c b/runtime/c/src/tls.c
index b550f13..e805dbc 100644
--- a/runtime/c/src/tls.c
+++ b/runtime/c/src/tls.c
@@ -74,12 +74,15 @@ Tls_get_err_context() {
BOOL WINAPI
DllMain(HINSTANCE dll, DWORD reason, LPVOID reserved) {
+ UNUSED_VAR(dll);
+ UNUSED_VAR(reserved);
+
if (reason == DLL_THREAD_DETACH) {
ErrContext *context
= (ErrContext*)TlsGetValue(err_context_tls_index);
if (context) {
- DECREF(context->current_error);
+ CFISH_DECREF(context->current_error);
FREEMEM(context);
}
}