summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-03-29 04:23:42 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-03-29 04:23:42 +0000
commit9c215874b929cc62ebb0a41eb1993d37d6abcb73 (patch)
tree292274d632ecab5f988f32d9b1c8376f170931d1
parentb97e925571e32dff40573af7991d7dfe7fc9c7ce (diff)
* include/ruby/missing.h: fixed merge mistake of r39985.
[Backport #8080] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@39995 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--include/ruby/missing.h5
-rw-r--r--version.h6
3 files changed, 8 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index ce748258d7..8e55602d9e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Mar 29 13:22:15 2013 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * include/ruby/missing.h: fixed merge mistake of r39985.
+ [Backport #8080]
+
Thu Mar 28 19:01:54 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* include/ruby/missing.h: removed __linux__. it's unnecessary.
diff --git a/include/ruby/missing.h b/include/ruby/missing.h
index d2cacd2706..f055104a0e 100644
--- a/include/ruby/missing.h
+++ b/include/ruby/missing.h
@@ -54,11 +54,6 @@ struct timezone {
};
#endif
-#if defined(HAVE___SYSCALL) && defined(__APPLE__)
-/* 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
diff --git a/version.h b/version.h
index bd85d75791..8ef09ff95e 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
#define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 400
+#define RUBY_PATCHLEVEL 401
-#define RUBY_RELEASE_DATE "2013-03-28"
+#define RUBY_RELEASE_DATE "2013-03-29"
#define RUBY_RELEASE_YEAR 2013
#define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 28
+#define RUBY_RELEASE_DAY 29
#include "ruby/version.h"