drinkingtea/ox
2
0
Fork 0
Code Issues Pull Requests Actions Releases Wiki Activity

Merge branch 'master' of github.com:wombatant/memphis

Browse Source
This commit is contained in:
Gary Talent
2016-06-18 01:35:27 -05:00
parent 009d360746 1e1c863596
commit 60d5d2694e
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/_types.hpp
+4 -2
View File
@@ -25,10 +25,12 @@ typedef unsigned long long uint64_t;
typedef uint32_t Error; typedef uint32_t Error;
#ifdef _LP64 #if defined(_LP64) || defined(__ppc64__)
typedef uint64_t size_t; typedef uint64_t size_t;
#elif _LP32 #elif defined(_LP32) || defined(__ppc__)
typedef uint32_t size_t; typedef uint32_t size_t;
#else
#error size_t undefined
#endif #endif
} }
src/filestore.hpp
+1 -1
View File
@@ -200,7 +200,7 @@ FileStore<FsSize_t>::FileStore(uint8_t *begin, uint8_t *end, Error *error): m_ve
auto header = (FsHeader*) m_begin; auto header = (FsHeader*) m_begin;
m_root = ptr<Inode*>(header->rootInode); m_root = ptr<Inode*>(header->rootInode);
if (error) { if (error) {
*error = header->size != m_end - m_begin; *error = header->size != (unsigned ) (m_end - m_begin);
} }
} }
} }