From 4e308530f4024de83e073b402dcdc7de1e729685 Mon Sep 17 00:00:00 2001 From: XaeroX Date: Tue, 10 Apr 2018 10:35:26 +0300 Subject: [PATCH] 64 bit fixes --- Makefile | 2 +- common/filelib.cpp | 2 +- common/threads.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 7706ea1..7ad7fe0 100644 --- a/Makefile +++ b/Makefile @@ -87,7 +87,7 @@ COMMON_DEFINITIONS = \ HAVE_SYS_TIME_H \ HAVE_UNISTD_H \ -COMMON_FLAGS = -Wall -O2 -fno-strict-aliasing -pthread -pipe $(USER_FLAGS) +COMMON_FLAGS = -Wall -Wno-deprecated-declarations -O2 -fno-strict-aliasing -pthread -pipe $(USER_FLAGS) # # Specific .cpp and .h files for hlcsg, hlbsp, hlvis, hlrad and ripent diff --git a/common/filelib.cpp b/common/filelib.cpp index 11befd4..d2209b3 100644 --- a/common/filelib.cpp +++ b/common/filelib.cpp @@ -87,7 +87,7 @@ long getfiledata(const char* const filename, char* buffer, const int } _close(handle); time(&end); - Log("%10.3fMB] (%d)\n", size / (1024.0 * 1024.0), end - start); + Log("%10.3fMB] (%d)\n", size / (1024.0 * 1024.0), (int)(end - start)); } if (buffersize != size) diff --git a/common/threads.cpp b/common/threads.cpp index 7c7a876..22d1a6a 100644 --- a/common/threads.cpp +++ b/common/threads.cpp @@ -656,7 +656,7 @@ void threads_UninitCrit() */ void RunThreadsOn(int workcnt, bool showpacifier, q_threadfunction func) { - int i; + intptr_t i; pthread_t work_threads[MAX_THREADS]; pthread_addr_t status; pthread_attr_t attrib;