From 1c428aa1f301000781ab6297aa05ed5be2cb59c4 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Fri, 24 Jun 2016 20:43:07 -0500 Subject: [PATCH] Added support for ARM. --- src/ox/fs/filestore.hpp | 2 +- src/ox/std/_types.hpp | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/ox/fs/filestore.hpp b/src/ox/fs/filestore.hpp index 8f87622a2..c92fbb8e6 100644 --- a/src/ox/fs/filestore.hpp +++ b/src/ox/fs/filestore.hpp @@ -199,7 +199,7 @@ FileStore::FileStore(uint8_t *begin, uint8_t *end, Error *error): m_ve auto header = (FsHeader*) m_begin; m_root = ptr(header->rootInode); if (error) { - *error = header->size != (unsigned ) (m_end - m_begin); + *error = header->size != (unsigned) (m_end - m_begin); } } } diff --git a/src/ox/std/_types.hpp b/src/ox/std/_types.hpp index ead0a20cc..d2df57bcc 100644 --- a/src/ox/std/_types.hpp +++ b/src/ox/std/_types.hpp @@ -10,21 +10,21 @@ namespace ox { namespace std { -typedef char int8_t; -typedef unsigned char uint8_t; -typedef short int16_t; -typedef unsigned short uint16_t; -typedef int int32_t; -typedef unsigned int uint32_t; -typedef unsigned uint_t; -typedef long long int64_t; -typedef unsigned long long uint64_t; +typedef char int8_t; +typedef unsigned char uint8_t; +typedef short int16_t; +typedef unsigned short uint16_t; +typedef int int32_t; +typedef unsigned int uint32_t; +typedef unsigned uint_t; +typedef long long int64_t; +typedef unsigned long long uint64_t; -typedef uint32_t Error; +typedef uint32_t Error; -#if defined(_LP64) || defined(__ppc64__) || defined(_WIN64) +#if defined(_LP64) || defined(__ppc64__) || defined(_WIN64) || defined(__aarch64__) typedef uint64_t size_t; -#elif defined(_LP32) || defined(__ppc__) || defined(_WIN32) +#elif defined(_LP32) || defined(__ppc__) || defined(_WIN32) || defined(__arm__) typedef uint32_t size_t; #else #error size_t undefined