summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-07-27 08:59:51 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-07-27 08:59:51 +0000
commitbed02ef5312ec5f5aadaddda7889c4c53662b1b6 (patch)
tree152c12bc09ddba8416464680576a7291466bced7
parent88b031a321cf43b656ebfd7e27945c5afc2a20d9 (diff)
merge revision(s) 32702:
* include/ruby/missing.h: define __syscall if the platform has __syscall in the library but doesn't define it in headers for example Mac OS X. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@32704 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--include/ruby/missing.h5
2 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index a6552b5182..ceb14d0501 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Jul 27 17:59:46 2011 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * include/ruby/missing.h: define __syscall if the platform has
+ __syscall in the library but doesn't define it in headers
+ for example Mac OS X.
+
Wed Jul 27 15:39:14 2011 Eric Hodel <drbrain@segment7.net>
* object.c: Add usage documentation for BasicObject. Based on patch
diff --git a/include/ruby/missing.h b/include/ruby/missing.h
index 067145a156..5309fe9466 100644
--- a/include/ruby/missing.h
+++ b/include/ruby/missing.h
@@ -51,6 +51,11 @@ struct timezone {
};
#endif
+#if defined(HAVE___SYSCALL) && !defined(__syscall)
+/* Mac OS X has __syscall but doen't defined in headers */
+off_t __syscall(quad_t number, ...);
+#endif
+
#ifdef RUBY_EXPORT
#undef RUBY_EXTERN
#endif