From 378cb20c28d169566bca7a14710d1bbbc0eda819 Mon Sep 17 00:00:00 2001
From: Phillip Stephens <antidote.crk@gmail.com>
Date: Sat, 12 Sep 2015 19:40:22 -0800
Subject: [PATCH] FreeBSD Fixes

---
 hecl/extern/Athena         | 2 +-
 hecl/include/HECL/HECL.hpp | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/hecl/extern/Athena b/hecl/extern/Athena
index 574038a82..0762a3bdc 160000
--- a/hecl/extern/Athena
+++ b/hecl/extern/Athena
@@ -1 +1 @@
-Subproject commit 574038a826f6261dde9d68cd0f90fa5656cadc99
+Subproject commit 0762a3bdcc0548188b4c637dde9f315bfeb9fc2b
diff --git a/hecl/include/HECL/HECL.hpp b/hecl/include/HECL/HECL.hpp
index eef730fc1..1b48ffe4f 100644
--- a/hecl/include/HECL/HECL.hpp
+++ b/hecl/include/HECL/HECL.hpp
@@ -622,6 +622,9 @@ public:
  */
 std::unique_ptr<ProjectRootPath> SearchForProject(const SystemString& path);
 
+#undef bswap16
+#undef bswap32
+#undef bswap64
 
 /* Type-sensitive byte swappers */
 template <typename T>