From 6738ceedae7e2bea8882565a4fe6f5e9cd3c8bc8 Mon Sep 17 00:00:00 2001
From: ThePhD <phdofthehouse@gmail.com>
Date: Sat, 11 Nov 2017 18:33:56 -0500
Subject: [PATCH] finally fix handling of exceptions, pray to the Lord it works

---
 single/sol/sol.hpp         | 10 +++++-----
 sol/protected_function.hpp |  4 ++--
 sol/stack.hpp              |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/single/sol/sol.hpp b/single/sol/sol.hpp
index 36332571..11e6bb9d 100644
--- a/single/sol/sol.hpp
+++ b/single/sol/sol.hpp
@@ -20,8 +20,8 @@
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 // This file was generated with a script.
-// Generated 2017-11-11 12:41:27.450855 UTC
-// This header was generated with sol v2.18.6 (revision e667e69)
+// Generated 2017-11-11 23:29:02.509687 UTC
+// This header was generated with sol v2.18.6 (revision 2d31d84)
 // https://github.com/ThePhD/sol2
 
 #ifndef SOL_SINGLE_INCLUDE_HPP
@@ -10468,7 +10468,7 @@ namespace sol {
 		}
 
 		inline void luajit_exception_off(lua_State* L) {
-#ifdef SOL_LUAJIT
+#if defined(SOL_LUAJIT)
 			if (L == nullptr) {
 				return;
 			}
@@ -13546,7 +13546,7 @@ namespace sol {
 					stack::push(lua_state(), error);
 				}
 			};
-#if defined(SOL_EXCEPTIONS_SAFE_PROPAGATION) && !defined(SOL_LUAJIT)
+#if !defined(SOL_EXCEPTIONS_SAFE_PROPAGATION) || defined(SOL_LUAJIT)
 			try {
 #endif // Safe Exception Propagation
 #endif // No Exceptions
@@ -13555,7 +13555,7 @@ namespace sol {
 				poststacksize = lua_gettop(lua_state()) - static_cast<int>(h.valid());
 				returncount = poststacksize - (firstreturn - 1);
 #ifndef SOL_NO_EXCEPTIONS
-#if defined(SOL_EXCEPTIONS_SAFE_PROPAGATION) && !defined(SOL_LUAJIT)
+#if !defined(SOL_EXCEPTIONS_SAFE_PROPAGATION) || defined(SOL_LUAJIT)
 			}
 			// Handle C++ errors thrown from C++ functions bound inside of lua
 			catch (const char* error) {
diff --git a/sol/protected_function.hpp b/sol/protected_function.hpp
index 4525d5d8..bde0899f 100644
--- a/sol/protected_function.hpp
+++ b/sol/protected_function.hpp
@@ -150,7 +150,7 @@ namespace sol {
 					stack::push(lua_state(), error);
 				}
 			};
-#if defined(SOL_EXCEPTIONS_SAFE_PROPAGATION) && !defined(SOL_LUAJIT)
+#if !defined(SOL_EXCEPTIONS_SAFE_PROPAGATION) || defined(SOL_LUAJIT)
 			try {
 #endif // Safe Exception Propagation
 #endif // No Exceptions
@@ -159,7 +159,7 @@ namespace sol {
 				poststacksize = lua_gettop(lua_state()) - static_cast<int>(h.valid());
 				returncount = poststacksize - (firstreturn - 1);
 #ifndef SOL_NO_EXCEPTIONS
-#if defined(SOL_EXCEPTIONS_SAFE_PROPAGATION) && !defined(SOL_LUAJIT)
+#if !defined(SOL_EXCEPTIONS_SAFE_PROPAGATION) || defined(SOL_LUAJIT)
 			}
 			// Handle C++ errors thrown from C++ functions bound inside of lua
 			catch (const char* error) {
diff --git a/sol/stack.hpp b/sol/stack.hpp
index 7e0db553..d2369bf4 100644
--- a/sol/stack.hpp
+++ b/sol/stack.hpp
@@ -246,7 +246,7 @@ namespace sol {
 		}
 
 		inline void luajit_exception_off(lua_State* L) {
-#ifdef SOL_LUAJIT
+#if defined(SOL_LUAJIT)
 			if (L == nullptr) {
 				return;
 			}