From 170b487430b93ea8ec3f46725d5955bddb0746dc Mon Sep 17 00:00:00 2001 From: oy Date: Sun, 11 Sep 2016 18:51:20 +0200 Subject: [PATCH] fixed compiling on macosx --- src/base/system.c | 2 +- src/base/system.h | 2 +- src/engine/client/serverbrowser.cpp | 2 +- src/osxlaunch/server.m | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/base/system.c b/src/base/system.c index b76773fc7..860ffe241 100644 --- a/src/base/system.c +++ b/src/base/system.c @@ -2113,7 +2113,7 @@ int secure_random_init() #endif } -void secure_random_fill(void *bytes, size_t length) +void secure_random_fill(void *bytes, unsigned length) { if(!secure_random_data.initialized) { diff --git a/src/base/system.h b/src/base/system.h index 92d880491..4b15c4efc 100644 --- a/src/base/system.h +++ b/src/base/system.h @@ -1340,7 +1340,7 @@ int secure_random_init(); bytes - Pointer to the start of the buffer. length - Length of the buffer. */ -void secure_random_fill(void *bytes, size_t length); +void secure_random_fill(void *bytes, unsigned length); #ifdef __cplusplus } diff --git a/src/engine/client/serverbrowser.cpp b/src/engine/client/serverbrowser.cpp index 4d9ad775f..41b63084c 100644 --- a/src/engine/client/serverbrowser.cpp +++ b/src/engine/client/serverbrowser.cpp @@ -234,7 +234,7 @@ void CServerBrowser::Update(bool ForceResort) // interface functions void CServerBrowser::SetType(int Type) { - if(Type < 0 || Type >= NUM_TYPES && Type != m_ActServerlistType) + if(Type < 0 || Type >= NUM_TYPES || Type == m_ActServerlistType) return; m_ActServerlistType = Type; diff --git a/src/osxlaunch/server.m b/src/osxlaunch/server.m index 5ae32c6fa..6f18ecb04 100644 --- a/src/osxlaunch/server.m +++ b/src/osxlaunch/server.m @@ -1,6 +1,6 @@ #import -@interface ServerView : NSTextView +@interface ServerView : NSTextView { NSTask *task; NSFileHandle *file;