From 8c576ef9c5470f0ba421f338fbc8019ef4cb8372 Mon Sep 17 00:00:00 2001
From: Gary Talent <gtalent2@gmail.com>
Date: Thu, 19 Dec 2019 23:38:17 -0600
Subject: [PATCH] [ox] Replace __attribute__((packed)) with OX_PACKED

---
 deps/ox/src/ox/fs/filestore/filestoretemplate.hpp | 4 ++--
 deps/ox/src/ox/fs/filesystem/directory.hpp        | 4 ++--
 deps/ox/src/ox/fs/filesystem/filesystem.hpp       | 2 +-
 deps/ox/src/ox/ptrarith/nodebuffer.hpp            | 7 ++++---
 deps/ox/src/ox/ptrarith/test/tests.cpp            | 2 +-
 deps/ox/src/ox/std/byteswap.hpp                   | 3 ++-
 deps/ox/src/ox/std/random.hpp                     | 3 ++-
 deps/ox/src/ox/std/stddef.hpp                     | 6 ++++++
 8 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/deps/ox/src/ox/fs/filestore/filestoretemplate.hpp b/deps/ox/src/ox/fs/filestore/filestoretemplate.hpp
index 77961779..4d7ccdb4 100644
--- a/deps/ox/src/ox/fs/filestore/filestoretemplate.hpp
+++ b/deps/ox/src/ox/fs/filestore/filestoretemplate.hpp
@@ -23,7 +23,7 @@ struct StatInfo {
 };
 
 template<typename size_t>
-struct __attribute__((packed)) FileStoreItem: public ptrarith::Item<size_t> {
+struct OX_PACKED FileStoreItem: public ptrarith::Item<size_t> {
 	ox::LittleEndian<size_t> id = 0;
 	ox::LittleEndian<uint8_t> fileType = 0;
 	ox::LittleEndian<size_t> links = 0;
@@ -64,7 +64,7 @@ class FileStoreTemplate {
 		static constexpr InodeId_t ReservedInodeEnd = 100;
 		static constexpr auto MaxInode = MaxValue<size_t> / 2;
 
-		struct __attribute__((packed)) FileStoreData {
+		struct OX_PACKED FileStoreData {
 			ox::LittleEndian<size_t> rootNode = 0;
 			ox::Random random;
 		};
diff --git a/deps/ox/src/ox/fs/filesystem/directory.hpp b/deps/ox/src/ox/fs/filesystem/directory.hpp
index 1b625fc3..cfe1d69c 100644
--- a/deps/ox/src/ox/fs/filesystem/directory.hpp
+++ b/deps/ox/src/ox/fs/filesystem/directory.hpp
@@ -16,10 +16,10 @@
 namespace ox {
 
 template<typename InodeId_t>
-struct __attribute__((packed)) DirectoryEntry {
+struct OX_PACKED DirectoryEntry {
 
 	public:
-		struct __attribute__((packed)) DirectoryEntryData {
+		struct OX_PACKED DirectoryEntryData {
 			// DirectoryEntry fields
 			LittleEndian<InodeId_t> inode = 0;
 			char name[MaxFileNameLength];
diff --git a/deps/ox/src/ox/fs/filesystem/filesystem.hpp b/deps/ox/src/ox/fs/filesystem/filesystem.hpp
index c81eb29c..a8eed502 100644
--- a/deps/ox/src/ox/fs/filesystem/filesystem.hpp
+++ b/deps/ox/src/ox/fs/filesystem/filesystem.hpp
@@ -89,7 +89,7 @@ class FileSystemTemplate: public FileSystem {
 	private:
 		static constexpr auto InodeFsData = 2;
 
-		struct __attribute__((packed)) FileSystemData {
+		struct OX_PACKED FileSystemData {
 			LittleEndian<typename FileStore::InodeId_t> rootDirInode;
 		};
 
diff --git a/deps/ox/src/ox/ptrarith/nodebuffer.hpp b/deps/ox/src/ox/ptrarith/nodebuffer.hpp
index bf92b925..bbb190de 100644
--- a/deps/ox/src/ox/ptrarith/nodebuffer.hpp
+++ b/deps/ox/src/ox/ptrarith/nodebuffer.hpp
@@ -8,6 +8,7 @@
 
 #pragma once
 
+#include <ox/std/stddef.hpp>
 #include <ox/std/trace.hpp>
 
 #include "ptr.hpp"
@@ -15,10 +16,10 @@
 namespace ox::ptrarith {
 
 template<typename size_t, typename Item>
-class __attribute__((packed)) NodeBuffer {
+class OX_PACKED NodeBuffer {
 
 	public:
-		struct __attribute__((packed)) Header {
+		struct OX_PACKED Header {
 			ox::LittleEndian<size_t> size = sizeof(Header); // capacity
 			ox::LittleEndian<size_t> bytesUsed = sizeof(Header);
 			ox::LittleEndian<size_t> firstItem = 0;
@@ -433,7 +434,7 @@ uint8_t *NodeBuffer<size_t, Item>::data() {
 
 
 template<typename size_t>
-struct __attribute__((packed)) Item {
+struct OX_PACKED Item {
 	public:
 		ox::LittleEndian<size_t> prev = 0;
 		ox::LittleEndian<size_t> next = 0;
diff --git a/deps/ox/src/ox/ptrarith/test/tests.cpp b/deps/ox/src/ox/ptrarith/test/tests.cpp
index e15546c5..fdb79e11 100644
--- a/deps/ox/src/ox/ptrarith/test/tests.cpp
+++ b/deps/ox/src/ox/ptrarith/test/tests.cpp
@@ -26,7 +26,7 @@ using namespace std;
 using namespace ox;
 
 template<typename T>
-struct __attribute__((packed)) NodeType: public ox::ptrarith::Item<T> {
+struct OX_PACKED NodeType: public ox::ptrarith::Item<T> {
 	public:
 		size_t fullSize() const {
 			return this->size() + sizeof(*this);
diff --git a/deps/ox/src/ox/std/byteswap.hpp b/deps/ox/src/ox/std/byteswap.hpp
index d4dd9612..ff0ac3bf 100644
--- a/deps/ox/src/ox/std/byteswap.hpp
+++ b/deps/ox/src/ox/std/byteswap.hpp
@@ -9,6 +9,7 @@
 #pragma once
 
 #include "defines.hpp"
+#include "stddef.hpp"
 #include "types.hpp"
 #include "typetraits.hpp"
 
@@ -58,7 +59,7 @@ template<typename T, bool byteSwap>
 }
 
 template<typename T, bool byteSwap>
-class __attribute__((packed)) ByteSwapInteger {
+class OX_PACKED ByteSwapInteger {
 	private:
 		T m_value;
 
diff --git a/deps/ox/src/ox/std/random.hpp b/deps/ox/src/ox/std/random.hpp
index 72108e0b..8743272f 100644
--- a/deps/ox/src/ox/std/random.hpp
+++ b/deps/ox/src/ox/std/random.hpp
@@ -8,13 +8,14 @@
 
 #pragma once
 
+#include "stddef.hpp"
 #include "types.hpp"
 
 namespace ox {
 
 using RandomSeed = uint64_t[2];
 
-class __attribute__((packed)) Random {
+class OX_PACKED Random {
 	private:
 		RandomSeed m_seed;
 
diff --git a/deps/ox/src/ox/std/stddef.hpp b/deps/ox/src/ox/std/stddef.hpp
index ad44d883..1a41f50c 100644
--- a/deps/ox/src/ox/std/stddef.hpp
+++ b/deps/ox/src/ox/std/stddef.hpp
@@ -13,3 +13,9 @@
 #else
 #define offsetof(type, member) __builtin_offsetof(type, member)
 #endif
+
+#ifdef _MSC_VER
+#define OX_PACKED
+#else
+#define OX_PACKED __attribute__((packed))
+#endif