Merge branch 'hotfix/osx-lua-check-builtin-macro-collision-fix2' into stable

Build/CMakeLists.txt

@@ -81,7 +81,7 @@ if(APPLE)
 	# Disables naked builtins from AssertMacros.h which
 	# This prevents naming collisions such as those from the check()
 	# function macro with LuaType::check
-	add_definitions(-D_ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=0)
+	add_definitions(-D__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=0)
 endif(APPLE)
 
 #===================================