* main.c (main): use platform-independent per-process initialization.

  [ruby-dev:31900]

* ruby.c (ruby_sysinit): new function for per-process initialization.

* include/ruby/ruby.h (RUBY_GLOBAL_SETUP): toplevel setup declaration.

* include/ruby/win32.h, win32/mkexports.rb: alias NtInitialize
  ruby_sysinit.

* win32/win32.c (rb_w32_sysinit): renamed from NtInitialize.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13569 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 2 insertions, 18 deletions

diff --git a/main.c b/main.c
index b5c5bb3351..e9d1bada5f 100644
--- a/main.c
+++ b/main.c
@@ -13,18 +13,7 @@
 #undef RUBY_EXPORT
 #include "ruby/ruby.h"
 
-#if defined(__MACOS__) && defined(__MWERKS__)
-#include <console.h>
-#endif
-
-/* to link startup code with ObjC support */
-#if (defined(__APPLE__) || defined(__NeXT__)) && defined(__MACH__)
-static void
-objcdummyfunction(void)
-{
-    objc_msgSend();
-}
-#endif
+RUBY_GLOBAL_SETUP
 
 int
 main(int argc, char **argv, char **envp)
@@ -33,13 +22,8 @@ main(int argc, char **argv, char **envp)
     extern void ruby_set_debug_option(const char *);
     ruby_set_debug_option(getenv("RUBY_DEBUG"));
 #endif
-#ifdef _WIN32
-    NtInitialize(&argc, &argv);
-#endif
-#if defined(__MACOS__) && defined(__MWERKS__)
-    argc = ccommand(&argv);
-#endif
 
+    ruby_sysinit(&argc, &argv);
     {
 	RUBY_INIT_STACK;
 	ruby_init();