From 3d356298cc846fa211b290072af10384dd842769 Mon Sep 17 00:00:00 2001 From: David Brown Date: Tue, 23 Aug 2016 17:54:17 +0100 Subject: [PATCH] Oh heck, I'm going around in circles to get size_t working cross platform. Trying again. --- src/system/SYSTEM.h | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/system/SYSTEM.h b/src/system/SYSTEM.h index ebd704f1..fc959e63 100644 --- a/src/system/SYSTEM.h +++ b/src/system/SYSTEM.h @@ -18,18 +18,16 @@ typedef unsigned char SYSTEM_CARD8; #if (__SIZEOF_POINTER__ == 8) #if defined(_WIN64) - typedef unsigned long long SYSTEM_ADDRESS; + typedef unsigned long long size_t; #else - typedef unsigned long SYSTEM_ADDRESS; + typedef unsigned long size_t; #endif #else - typedef unsigned int SYSTEM_ADDRESS; + typedef unsigned int size_t; #endif - -// For FreeBSD and OpenBSD: -typedef SYSTEM_ADDRESS size_t; -#define _SIZE_T_DECLARED +#define SYSTEM_ADDRESS size_t +#define _SIZE_T_DECLARED // For FreeBSD and OpenBSD: void *memcpy(void *dest, const void *source, SYSTEM_ADDRESS size);