From: Pekka Riikonen <priikone@silcnet.org>
Date: Thu, 17 May 2007 15:18:16 +0000 (+0000)
Subject: 	WIN32 compilation error fixes.
X-Git-Tag: silc.client.1.1.beta5~15
X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=commitdiff_plain;h=25356f9babbb4c5f3285b7ddcb3d1b2c9ba22589

	WIN32 compilation error fixes.
---

diff --git a/lib/silchttp/silchttpserver.c b/lib/silchttp/silchttpserver.c
index 772d9c9b..cd94c407 100644
--- a/lib/silchttp/silchttpserver.c
+++ b/lib/silchttp/silchttpserver.c
@@ -146,7 +146,7 @@ static SilcBool silc_http_server_parse(SilcHttpServer httpd,
     SILC_LOG_DEBUG(("URI: '%s'", conn->uri));
 
     /* Protocol version compatibility */
-    tmp = memchr(tmp, '\0', data_len - (tmp - data)) + 1;
+    tmp = ((unsigned char *)memchr(tmp, '\0', data_len - (tmp - data))) + 1;
     SILC_LOG_DEBUG(("Protocol: %s", tmp));
     if (strstr(tmp, "HTTP/1.0"))
       conn->keepalive = FALSE;
diff --git a/lib/silcutil/silcatomic.h b/lib/silcutil/silcatomic.h
index 15b39319..681c8e95 100644
--- a/lib/silcutil/silcatomic.h
+++ b/lib/silcutil/silcatomic.h
@@ -1208,7 +1208,8 @@ SilcBool silc_atomic_cas_pointer(SilcAtomicPointer *atomic, void *old_val,
 
 #elif defined(SILC_WIN32)
   /* Windows */
-  return InterlockedCompareExchangePointer(&atomic->value, n, o) == o;
+  return InterlockedCompareExchangePointer(&atomic->value, new_val, old_val)
+    == old_val;
 
 #elif defined(__GNUC__) && defined(SILC_I486)
   /* GCC + i486 */