summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-30 11:05:14 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-30 11:05:14 +0000
commit80ad6689810c9bd3605b75a94b566459138310db (patch)
tree23d266e9385514dfc7d8c65310b02df0d5d4399a
parenta2ba4372c63e82161987b74458758c4be89bd6ad (diff)
merges r21186 from trunk into ruby_1_9_1.
* ext/dl/test/test_import.rb: fix a prototype decl. pointed out by Takehiro Kubo [ruby-core:20971]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21199 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/dl/test/test_import.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c265a5f824..5e6aa3e9e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Dec 30 17:03:51 2008 Koichi Sasada <ko1@atdot.net>
+
+ * ext/dl/test/test_import.rb: fix a prototype decl.
+ pointed out by Takehiro Kubo [ruby-core:20971].
+
Tue Dec 30 16:56:09 2008 Koichi Sasada <ko1@atdot.net>
* thread.c (rb_thread_blocking_region): add a comment.
diff --git a/ext/dl/test/test_import.rb b/ext/dl/test/test_import.rb
index 6d493a6d23..8514f8298e 100644
--- a/ext/dl/test/test_import.rb
+++ b/ext/dl/test/test_import.rb
@@ -13,7 +13,7 @@ module DL
extern "int isdigit(int)"
extern "double atof(string)"
extern "unsigned long strtoul(char*, char **, int)"
- extern "int qsort(void*, int, int, void*)"
+ extern "int qsort(void*, unsigned long, unsigned long, void*)"
extern "int fprintf(FILE*, char*)"
extern "int gettimeofday(timeval*, timezone*)" rescue nil