usa	2013-03-29 13:23:42 +0900 (Fri, 29 Mar 2013)

  New Revision: 39995

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=39995

  Log:
    * include/ruby/missing.h: fixed merge mistake of r39985.
      [Backport #8080]

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/include/ruby/missing.h
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/include/ruby/missing.h
===================================================================
--- ruby_1_9_3/include/ruby/missing.h	(revision 39994)
+++ ruby_1_9_3/include/ruby/missing.h	(revision 39995)
@@ -54,11 +54,6 @@ struct timezone { https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/include/ruby/missing.h#L54
 };
 #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
Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 39994)
+++ ruby_1_9_3/ChangeLog	(revision 39995)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/ChangeLog#L1
+Fri Mar 29 13:22:15 2013  NAKAMURA Usaku  <usa@r...>
+
+	* include/ruby/missing.h: fixed merge mistake of r39985.
+	  [Backport #8080]
+
 Thu Mar 28 19:01:54 2013  KOSAKI Motohiro  <kosaki.motohiro@g...>
 
 	* include/ruby/missing.h: removed __linux__. it's unnecessary.
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 39994)
+++ ruby_1_9_3/version.h	(revision 39995)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/version.h#L1
 #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"
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/