From: Daniel P. Berrange <berrange@redhat.com>
Date: Tue, 5 Apr 2011 14:59:17 +0000 (+0100)
Subject: Avoid compiler warnings about int -> void * casts
X-Git-Tag: v0.9.1~182
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b099250e34194bb86471e49ed46963ee6bdb0ba;p=thirdparty%2Flibvirt.git

Avoid compiler warnings about int -> void * casts

GCC is a little confused about the cast of beginthread/beginthreadex
from unsigned long -> void *. Go via an intermediate variable avoids
the bogus warning, and makes the code a little cleaner

* src/util/threads-win32.c: Avoid compiler warning in cast
---

diff --git a/src/util/threads-win32.c b/src/util/threads-win32.c
index ddb4737c56..566143793f 100644
--- a/src/util/threads-win32.c
+++ b/src/util/threads-win32.c
@@ -262,6 +262,7 @@ int virThreadCreate(virThreadPtr thread,
                     void *opaque)
 {
     struct virThreadArgs *args;
+    uintptr_t ret;
 
     if (VIR_ALLOC(args) < 0)
         return -1;
@@ -271,17 +272,20 @@ int virThreadCreate(virThreadPtr thread,
 
     thread->joinable = joinable;
     if (joinable) {
-        thread->thread = (HANDLE)_beginthreadex(NULL, 0,
-                                                virThreadHelperJoinable,
-                                                args, 0, NULL);
-        if (thread->thread == 0)
+        ret = _beginthreadex(NULL, 0,
+                             virThreadHelperJoinable,
+                             args, 0, NULL);
+        if (ret == 0)
             return -1;
     } else {
-        thread->thread = (HANDLE)_beginthread(virThreadHelperDaemon,
-                                              0, args);
-        if (thread->thread == (HANDLE)-1L)
+        ret = _beginthread(virThreadHelperDaemon,
+                           0, args);
+        if (ret == -1L)
             return -1;
     }
+
+    thread->thread = (HANDLE)ret;
+
     return 0;
 }