From db4eec7249f8e557cf613e267f4d3455d4da3267 Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 16 Jan 2017 19:09:23 +0000
Subject: [PATCH] merge revision(s) 56832: [Backport #12956]

	dln.c: raise LoadError

	* dln.c (dln_load): raise LoadError instead of fatal error on
  recent OSX, dlclose seems fixed in El Capitan or later.
  [ruby-core:78200] [Bug #12956]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@57344 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 dln.c     | 4 +++-
 version.h | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dln.c b/dln.c
index 51545fbbb2..0f918af090 100644
--- a/dln.c
+++ b/dln.c
@@ -1331,7 +1331,9 @@ dln_load(const char *file)
 	    void *ex = dlsym(handle, EXTERNAL_PREFIX"ruby_xmalloc");
 	    if (ex && ex != ruby_xmalloc) {
 
-#   if defined __APPLE__
+#   if defined __APPLE__ && \
+    defined(MAC_OS_X_VERSION_MIN_REQUIRED) && \
+    (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_11)
 		/* dlclose() segfaults */
 		rb_fatal("%s - %s", incompatible, file);
 #   else
diff --git a/version.h b/version.h
index c1b5713297..0fe41cfceb 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.3.3"
 #define RUBY_RELEASE_DATE "2017-01-17"
-#define RUBY_PATCHLEVEL 228
+#define RUBY_PATCHLEVEL 229
 
 #define RUBY_RELEASE_YEAR 2017
 #define RUBY_RELEASE_MONTH 1