From 25356f9babbb4c5f3285b7ddcb3d1b2c9ba22589 Mon Sep 17 00:00:00 2001 From: Pekka Riikonen Date: Thu, 17 May 2007 15:18:16 +0000 Subject: [PATCH] WIN32 compilation error fixes. --- lib/silchttp/silchttpserver.c | 2 +- lib/silcutil/silcatomic.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) 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 */ -- 2.24.0