summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-05-14 10:55:38 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-05-14 10:55:38 +0000
commit7093a2cb5bdd85f84601815d08da90ef71c3322f (patch)
tree8b7cddc9c06ff65fad73c4dc546f5154c917c8c3 /ext
parent1b03f51f823a326164d0a8fb51e8270b8f28d327 (diff)
* ext/openssl/depend: remove dependency from internal headers.
[Feature #9612] * ext/openssl/ossl.c (ossl_fips_mode_set): ditto. * ext/coverage/depend: ditto. * include/ruby/thread_native.h: added. This header file only provides wrapper functions to control native threads. These wrapper functions are used by MRI implementation. * vm_core.h: use include/ruby/thread_native.h. * thread.c: ditto. * thread_pthread.h: ditto. * thread_win32.h: ditto. * thread_native.h: removed. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45944 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r--ext/coverage/depend2
-rw-r--r--ext/openssl/depend1
-rw-r--r--ext/openssl/ossl.c2
3 files changed, 2 insertions, 3 deletions
diff --git a/ext/coverage/depend b/ext/coverage/depend
index 1227a5c..ad0ac1c 100644
--- a/ext/coverage/depend
+++ b/ext/coverage/depend
@@ -8,4 +8,4 @@ $(OBJS): $(HDRS) $(ruby_headers) \
$(top_srcdir)/ruby_atomic.h \
$(top_srcdir)/thread_pthread.h \
$(top_srcdir)/internal.h \
- $(top_srcdir)/thread_native.h
+ $(top_srcdir)/include/ruby/thread_native.h
diff --git a/ext/openssl/depend b/ext/openssl/depend
index 7991159..9d47df2 100644
--- a/ext/openssl/depend
+++ b/ext/openssl/depend
@@ -3,4 +3,3 @@ $(OBJS): $(HDRS) $(ruby_headers) \
$(hdrdir)/ruby/encoding.h \
$(hdrdir)/ruby/oniguruma.h \
$(hdrdir)/ruby/thread.h
-ossl.o: $(top_srcdir)/thread_native.h $(top_srcdir)/thread_$(THREAD_MODEL).h
diff --git a/ext/openssl/ossl.c b/ext/openssl/ossl.c
index 370a16f..3f09ce7 100644
--- a/ext/openssl/ossl.c
+++ b/ext/openssl/ossl.c
@@ -467,7 +467,7 @@ ossl_fips_mode_set(VALUE self, VALUE enabled)
/**
* Stores locks needed for OpenSSL thread safety
*/
-#include "../../thread_native.h"
+#include "ruby/thread_native.h"
static rb_nativethread_lock_t *ossl_locks;
static void