Repository: lucy-clownfish
Updated Branches:
  refs/heads/master 4e540372c -> d0b8eaee2


Fix DECREF name clash under MinGW

MinGW's winnt.h also defines DECREF.

Also fix unused variable warnings in the Windows TLS code.


Project: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/commit/269ceeb1
Tree: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/tree/269ceeb1
Diff: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/diff/269ceeb1

Branch: refs/heads/master
Commit: 269ceeb1b4faa3f95bf6e8cedf078b5e9abf4e3c
Parents: 4e54037
Author: Nick Wellnhofer <[email protected]>
Authored: Sat May 21 01:54:36 2016 +0200
Committer: Nick Wellnhofer <[email protected]>
Committed: Sat May 21 17:22:17 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/269ceeb1/runtime/c/src/tls.c
----------------------------------------------------------------------
diff --git a/runtime/c/src/tls.c b/runtime/c/src/tls.c
index a7fda40..448049a 100644
--- a/runtime/c/src/tls.c
+++ b/runtime/c/src/tls.c
@@ -79,12 +79,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);
         }
     }

Reply via email to