summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-10-09 13:17:20 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-10-09 13:17:20 +0000
commitb9762ef2962dc75df99efafc5c3f674359ad428d (patch)
treef5d165456ea3e68cdbeb9355794ed8a939cd4526
parent587016b485794e5b34a3965854f46b1cab36e073 (diff)
merges 33352 from trunk into ruby_1_9_3.
-- * configure.in (pthread_np.h): needs pthread.h to be included previously on OpenBSD. a patch by George Koehler <xkernigh AT netscape.net> at [ruby-core:39752]. [Bug #5376] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--configure.in2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 616136f5f7..644d3ce1f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Sep 28 09:14:16 2011 Nobuyoshi Nakada <>
+
+ * configure.in (pthread_np.h): needs pthread.h to be included
+ previously on OpenBSD. a patch by George Koehler <xkernigh AT
+ netscape.net> at [ruby-core:39752]. [Bug #5376]
+
Tue Sep 13 15:02:48 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/pstore.rb (PStore): always open in binary mode even if
diff --git a/configure.in b/configure.in
index 73c87b708d..5bc2e4eea1 100644
--- a/configure.in
+++ b/configure.in
@@ -1817,7 +1817,7 @@ if test x"$enable_pthread" = xyes; then
AC_DEFINE(_REENTRANT)
AC_DEFINE(_THREAD_SAFE)
AC_DEFINE(HAVE_LIBPTHREAD)
- AC_CHECK_HEADERS(pthread_np.h)
+ AC_CHECK_HEADERS(pthread_np.h, [], [], [@%:@include <pthread.h>])
AS_CASE([$pthread_lib],
[c], [],
[root], [],