summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-07-09 15:53:02 +0000
committerkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-07-09 15:53:02 +0000
commit428a5a9cd95b92b0a5570cb1154191c23453ebd4 (patch)
treeca7ff63182aa32fec85480e0f37110b5c8c3b426
parentfe0b5d498b2c4721d9615f2bf1460456c1a828c9 (diff)
* include/ruby/ruby.h: Removed RUBY_GLOBAL_SETUP complely. It is
no meaning definition since r24894. * main.c: ditto. * nacl/pepper_main.c: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36348 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--include/ruby/ruby.h7
-rw-r--r--main.c2
-rw-r--r--nacl/pepper_main.c2
4 files changed, 7 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 672ce70..9111bf2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Jul 10 00:44:41 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+
+ * include/ruby/ruby.h: Removed RUBY_GLOBAL_SETUP complely. It is
+ no meaning definition since r24894.
+ * main.c: ditto.
+ * nacl/pepper_main.c: ditto.
+
Mon Jul 9 23:59:36 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* dln.c: Simplify and make consistent an ifdef for Mac OS X.
diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h
index 23ba753..e74f65d 100644
--- a/include/ruby/ruby.h
+++ b/include/ruby/ruby.h
@@ -1485,13 +1485,6 @@ int ruby_vsnprintf(char *str, size_t n, char const *fmt, va_list ap);
*/
typedef void *ruby_opaque_t;
-/*! @deprecated You no longer need to use this macro. */
-#if (defined(__APPLE__) || defined(__NeXT__)) && defined(__MACH__)
-#define RUBY_GLOBAL_SETUP /* use linker option to link startup code with ObjC support */
-#else
-#define RUBY_GLOBAL_SETUP
-#endif
-
/** @defgroup ruby1 ruby(1) implementation
* A part of the implementation of ruby(1) command.
* Other programs that embed Ruby interpreter do not always need to use these
diff --git a/main.c b/main.c
index e100cdd..f4d526a 100644
--- a/main.c
+++ b/main.c
@@ -19,8 +19,6 @@
#include <stdlib.h>
#endif
-RUBY_GLOBAL_SETUP
-
int
main(int argc, char **argv)
{
diff --git a/nacl/pepper_main.c b/nacl/pepper_main.c
index 716a547..dc7b58c 100644
--- a/nacl/pepper_main.c
+++ b/nacl/pepper_main.c
@@ -29,8 +29,6 @@
#include "ruby/ruby.h"
#include "gc.h"
-RUBY_GLOBAL_SETUP
-
#ifdef HAVE_STRUCT_PPB_CORE
typedef struct PPB_Core PPB_Core;
#endif