[#4076] Re: call/cc — shugo@... (Shugo Maeda)

51 messages 1999/01/08
[#4077] Re: [ruby-list:11512] Re: call/cc — maeda@... 1999/01/08

前田@リコーです。

[#4078] Re: call/cc — shugo@... (Shugo Maeda) 1999/01/08

[#4079] Re: call/cc — kjana@... (YANAGAWA Kazuhisa) 1999/01/08

In message <m0zyZO8-0003EbC@crunkey.chocolate.or.jp>

[#4098] Re: call/cc — shugo@... (Shugo Maeda) 1999/01/11

[#4105] Re: call/cc — EGUCHI Osamu <eguchi@...> 1999/01/12

えぐち@エスアンドイー です。

[#4144] Re: call/cc — shugo@... (Shugo Maeda) 1999/01/13

[#4090] finalizers — matz@... (Yukihiro Matsumoto)

まつもと ゆきひろです

19 messages 1999/01/11

[#4095] Ruby on CYGWIN — TAKAHASHI Masayoshi <maki@...>

高橋です。久しぶりに書きます。

26 messages 1999/01/11
[#4111] Re: Ruby on CYGWIN — WATANABE Hirofumi <watanabe@...> 1999/01/12

わたなべです.

[#4115] Re: Ruby on CYGWIN — TAKAHASHI Masayoshi <maki@...> 1999/01/12

高橋です。Rubyのリンク集から見つけたのですが、sgmailって

[#4118] sgmail (Re: Ruby on CYGWIN) — Takahiro Maebashi <maebashi@...> 1999/01/12

前橋です。

[#4123] Tk? Gtk? (Re: sgmail) — TAKAHASHI Masayoshi <maki@...> 1999/01/13

高橋です。

[#4203] Compile via WATCOM C — ARIMA Yasuhiro <fit0298@...>

有馬です。

20 messages 1999/01/18
[#4204] Re: Compile via WATCOM C — KIMURA Koichi <kimura@...> 1999/01/18

[#4248] patch for ruby-mswin32 — Koji Oda <oda@...1.qnes.nec.co.jp>

小田@QNES です。

27 messages 1999/01/19
[#4254] Re: patch for ruby-mswin32 — matz@... (Yukihiro Matsumoto) 1999/01/19

まつもと ゆきひろです

[#4256] Re: patch for ruby-mswin32 — WATANABE Hirofumi <watanabe@...> 1999/01/19

わたなべです.

[#4258] Re: patch for ruby-mswin32 — matz@... (Yukihiro Matsumoto) 1999/01/19

まつもと ゆきひろです

[#4290] signed/unsigned char — ARIMA Yasuhiro <fit0298@...>

有馬です。

17 messages 1999/01/20
[#4292] Re: signed/unsigned char — EGUCHI Osamu <eguchi@...> 1999/01/20

えぐち@エスアンドイー です。

[#4293] Re: signed/unsigned char — ARIMA Yasuhiro <fit0298@...> 1999/01/20

Regard to "[ruby-dev:4292] Re: signed/unsigned char"

[#4295] Re: signed/unsigned char — EGUCHI Osamu <eguchi@...> 1999/01/20

えぐち@エスアンドイー です。

[#4327] pack("F") for bigendian float — gotoken@... (GOTO Kentaro)

ごとけんです。

25 messages 1999/01/22
[#4330] Re: pack("F") for bigendian float — gotoken@... (GOTO Kentaro) 1999/01/23

ごとけんです

[#4331] Re: pack("F") for bigendian float — gotoken@... (GOTO Kentaro) 1999/01/23

ごとけんです

[#4336] Re: pack("F") for bigendian float — matz@... (Yukihiro Matsumoto) 1999/01/24

まつもと ゆきひろです

[#4337] Re: pack("F") for bigendian float — gotoken@... (GOTO Kentaro) 1999/01/24

ごとけんです

[#4338] Re: pack("F") for bigendian float — Yamashita Junji (山下 純司) <ys_jyunji@...> 1999/01/24

山下 純司です。

[#4341] cascades on ruby — Kazunori NISHI <kazunori@...>

西@九大です。

51 messages 1999/01/25
[#4342] Re: cascades on ruby — Kazuhiro HIWADA <hiwada@...> 1999/01/25

ひわだです。

[#4343] Re: cascades on ruby — Kazunori NISHI <kazunori@...> 1999/01/25

西@九大です。

[#4344] Re: cascades on ruby — matz@... (Yukihiro Matsumoto) 1999/01/25

まつもと ゆきひろです

[#4386] Re: cascades on ruby — keiju@... (石塚圭樹 ) 1999/01/26

けいじゅ@日本ラショナルソフトウェアです.

[#4389] Re: cascades on ruby — matz@... (Yukihiro Matsumoto) 1999/01/26

まつもと ゆきひろです

[#4394] Re: cascades on ruby — keiju@... (石塚圭樹 ) 1999/01/26

けいじゅ@日本ラショナルソフトウェアです.

[#4396] keyword argument (Re: Re: cascades on ruby) — matz@... (Yukihiro Matsumoto) 1999/01/26

[#4399] Re: keyword argument (Re: Re: cascades on ruby) — keiju@... (石塚圭樹 ) 1999/01/26

けいじゅ@日本ラショナルソフトウェアです.

[#4400] Re: keyword argument (Re: Re: cascades on ruby) — matz@... (Yukihiro Matsumoto) 1999/01/26

まつもと ゆきひろです

[#4401] Re: keyword argument (Re: Re: cascades on ruby) — keiju@... (石塚圭樹 ) 1999/01/26

けいじゅ@日本ラショナルソフトウェアです.

[#4404] Re: keyword argument (Re: Re: cascades on ruby) — matz@... (Yukihiro Matsumoto) 1999/01/26

まつもと ゆきひろです

[#4410] Re: keyword argument (Re: Re: cascades on ruby) — keiju@... (石塚圭樹 ) 1999/01/26

けいじゅ@日本ラショナルソフトウェアです.

[#4412] Re: keyword argument (Re: Re: cascades on ruby) — matz@... (Yukihiro Matsumoto) 1999/01/26

まつもと ゆきひろです

[#4473] Re: keyword argument (Re: Re: cascades on ruby) — matz@... (Yukihiro Matsumoto) 1999/01/28

まつもと ゆきひろです

[#4495] Re: keyword argument (Re: Re: cascades on ruby) — shugo@... (Shugo Maeda) 1999/01/29

前田です。

[#4349] Re: [ruby-list:11707] Re: ruby 1.2.2 released — EGUCHI Osamu <eguchi@...>

えぐち@エスアンドイー です。

35 messages 1999/01/25
[#4353] Re: [ruby-list:11707] Re: ruby 1.2.2 released — EGUCHI Osamu <eguchi@...> 1999/01/25

えぐち@エスアンドイー です。

[#4357] --enable-shared/BSD (Re: ) — EGUCHI Osamu <eguchi@...> 1999/01/25

えぐち@エスアンドイー です。

[#4375] Re: --enable-shared/BSD (Re: ) — matz@... (Yukihiro Matsumoto) 1999/01/26

まつもと ゆきひろです

[#4387] Re: --enable-shared/BSD (Re: ) — EGUCHI Osamu <eguchi@...> 1999/01/26

えぐち@エスアンドイー です。

[#4391] Re: --enable-shared/BSD (Re: ) — matz@... (Yukihiro Matsumoto) 1999/01/26

まつもと ゆきひろです

[#4406] Re: --enable-shared/BSD (Re: ) — EGUCHI Osamu <eguchi@...> 1999/01/26

えぐち@エスアンドイー です。

[#4419] Re: module Precision — Inaba Hiroto <inaba@...>

21 messages 1999/01/26
[#4438] Re: module Precision — gotoken@... (GOTO Kentaro) 1999/01/27

ごとけんです

[#4451] Re: module Precision — Inaba Hiroto <inaba@...> 1999/01/27

From: gotoken@math.sci.hokudai.ac.jp (GOTO Kentaro)

[#4453] new class for float of C (Re: module Precision) — gotoken@... (GOTO Kentaro) 1999/01/27

ごとけんです

[#4457] Re: new class for float of C (Re: module Precision) — matz@... (Yukihiro Matsumoto) 1999/01/28

まつもと ゆきひろです

[#4460] Re: new class for float of C (Re: module Precision) — gotoken@... (GOTO Kentaro) 1999/01/28

ごとけんです

[#4461] Re: new class for float of C (Re: module Precision) — matz@... (Yukihiro Matsumoto) 1999/01/28

まつもと ゆきひろです

[#4462] Re: new class for float of C (Re: module Precision) — gotoken@... (GOTO Kentaro) 1999/01/28

ごとけんです

[#4420] ruby 1.3.1-990126 — matz@... (Yukihiro Matsumoto)

まつもと ゆきひろです

17 messages 1999/01/26

[#4452] permit to put a comma — Koji Arai <JCA02266@...>

新井です。

18 messages 1999/01/27
[#4484] Re: permit to put a comma — matz@... (Yukihiro Matsumoto) 1999/01/29

まつもと ゆきひろです

[#4518] Inf.0 — gotoken@... (GOTO Kentaro)

ごとけんです

17 messages 1999/01/30

[ruby-dev:4302] ruby-1.3 MacRuby patch

From: 藤本尚邦 / Hisakuni FUJIMOTO <hisa@...>
Date: 1999-01-21 05:44:48 UTC
List: ruby-dev #4302
  藤本です。こんにちは。

  ruby-1.3のMacRuby用のパッチが収束してきたので、パッチを送ります。他
へは影響しないよう注意して作ったつもりです。取り込んでもらえるとうれし
いです。

=============================================================
 藤本尚邦  FUJIMOTO Hisakuni                hisa@imasy.or.jp
=============================================================

Attachments (1)

ruby-1.3-mac.patch (13.1 KB, text/x-diff)
Index: ruby/ruby-1/defines.h
diff -u ruby/ruby-1/defines.h:1.1.1.6 ruby/ruby-1/defines.h:1.1.1.6.4.2
--- ruby/ruby-1/defines.h:1.1.1.6	Sun Dec 27 01:28:06 1998
+++ ruby/ruby-1/defines.h	Thu Jan 21 14:29:21 1999
@@ -44,7 +44,7 @@
 #define FLUSH_REGISTER_WINDOWS /* empty */
 #endif
 
-#if defined(MSDOS) || defined(NT) || defined(__human68k__) || defined(__MACOS__)
+#if defined(MSDOS) || defined(NT) || defined(__human68k__)
 #define RUBY_LIB_SEP ";"
 #else
 #define RUBY_LIB_SEP ":"
Index: ruby/ruby-1/dln.c
diff -u ruby/ruby-1/dln.c:1.1.1.7 ruby/ruby-1/dln.c:1.1.1.7.4.3
--- ruby/ruby-1/dln.c:1.1.1.7	Sun Dec 27 01:28:07 1998
+++ ruby/ruby-1/dln.c	Thu Jan 21 13:49:25 1999
@@ -64,6 +64,7 @@
 # include <TextUtils.h>
 # include <CodeFragments.h>
 # include <Aliases.h>
+# include "macruby_private.h"
 #endif
 
 #ifdef __BEOS__
@@ -1516,8 +1517,13 @@
     char *fname;
     char *path;
 {
+#ifndef __MACOS__
     if (!path) path = ".";
     return dln_find_1(fname, path, 0);
+#else
+    if (!path) path = ".";
+    return _macruby_path_conv_posix_to_macos(dln_find_1(fname, path, 0));
+#endif
 }
 
 #if defined(__CYGWIN32__)
@@ -1555,14 +1561,17 @@
     register char *dp;
     register char *ep;
     register char *bp;
+#ifndef __MACOS__
     struct stat st;
+#else
+    const char* mac_fullpath;
+#endif
 
 #if defined(__CYGWIN32__)
     char rubypath[MAXPATHLEN];
     conv_to_posix_path(path, rubypath);
     path = rubypath;
 #endif
-#ifndef __MACOS__
     if (fname[0] == '/') return fname;
     if (strncmp("./", fname, 2) == 0 || strncmp("../", fname, 3) == 0)
       return fname;
@@ -1574,7 +1583,6 @@
       return fname;
     if (exe_flag && strchr(fname, '\\')) return fname;
 #endif
-#endif /* __MACOS__ */
 
     for (dp = path;; dp = ++ep) {
 	register int l;
@@ -1582,7 +1590,7 @@
 	int fspace;
 
 	/* extract a component */
-#if !defined(MSDOS)  && !defined(NT) && !defined(__human68k__) && !defined(__MACOS__)
+#if !defined(MSDOS)  && !defined(NT) && !defined(__human68k__)
 	ep = strchr(dp, ':');
 #else
 	ep = strchr(dp, ';');
@@ -1630,11 +1638,7 @@
 
 	    /* add a "/" between directory and filename */
 	    if (ep[-1] != '/')
-#ifdef __MACOS__
-		*bp++ = ':';
-#else
 		*bp++ = '/';
-#endif
 	}
 
 	/* now append the file name */
@@ -1649,11 +1653,19 @@
 	}
 	memcpy(bp, fname, i + 1);
 
+#ifndef __MACOS__
 	if (stat(fbuf, &st) == 0) {
 	    if (exe_flag == 0) return fbuf;
 	    /* looking for executable */
 	    if (eaccess(fbuf, X_OK) == 0) return fbuf;
 	}
+#else
+	if (mac_fullpath = _macruby_exist_file_in_libdir_as_posix_name(fbuf)) {
+	    if (exe_flag == 0) return mac_fullpath;
+	    /* looking for executable */
+	    if (eaccess(mac_fullpath, X_OK) == 0) return mac_fullpath;
+	}
+#endif
 #if defined(MSDOS) || defined(NT) || defined(__human68k__)
 	if (exe_flag) {
 	    static const char *extension[] = {
@@ -1677,8 +1689,13 @@
 		    continue;
 		}
 		strcpy(bp + i, extension[j]);
+#ifndef __MACOS__
 		if (stat(fbuf, &st) == 0)
 		    return fbuf;
+#else
+		if (mac_fullpath = _macruby_exist_file_in_libdir_as_posix_name(fbuf))
+		    return mac_fullpath;
+#endif
 	    }
 	}
 #endif /* MSDOS or NT or __human68k__ */
Index: ruby/ruby-1/eval.c
diff -u ruby/ruby-1/eval.c:1.1.1.9 ruby/ruby-1/eval.c:1.1.1.9.4.2
--- ruby/ruby-1/eval.c:1.1.1.9	Sun Dec 27 01:28:09 1998
+++ ruby/ruby-1/eval.c	Thu Jan 21 13:49:25 1999
@@ -38,6 +38,10 @@
 #include <compat.h>
 #endif
 
+#ifdef __MACOS__
+#include "macruby_private.h"
+#endif
+
 #ifndef setjmp
 #ifdef HAVE__SETJMP
 #define setjmp(env) _setjmp(env)
@@ -886,6 +890,9 @@
 	ruby_frame->self = rb_top_self;
 	ruby_frame->cbase = (VALUE)rb_node_newnode(NODE_CREF,rb_cObject,0,0);
 	rb_define_global_const("TOPLEVEL_BINDING", rb_f_binding(rb_top_self));
+#ifdef __MACOS__
+	_macruby_init();
+#endif
 	ruby_prog_init();
     }
     POP_TAG();
@@ -4305,6 +4312,16 @@
     return 0;
 }
 
+#ifdef __MACOS__
+static int
+is_macos_native_path(path)
+    char *path;
+{
+    if (strchr(path, ':')) return 1;
+    return 0;
+}
+#endif
+
 static char*
 find_file(file)
     char *file;
@@ -4312,6 +4329,16 @@
     extern VALUE rb_load_path;
     char *path;
 
+#ifdef __MACOS__
+    if (is_macos_native_path(file)) {
+	FILE *f = fopen(file, "r");
+
+	if (f == NULL) return 0;
+	fclose(f);
+	return file;
+    }
+#endif
+
     if (is_absolute_path(file)) {
 	FILE *f = fopen(file, "r");
 
@@ -4354,11 +4381,9 @@
 
     rb_secure(4);
     Check_SafeStr(fname);
-#ifndef __MACOS__
     if (RSTRING(fname)->ptr[0] == '~') {
 	fname = rb_file_s_expand_path(1, &fname);
     }
-#endif
     file = find_file(RSTRING(fname)->ptr);
     if (!file) {
 	rb_raise(rb_eLoadError, "No such file to load -- %s",
Index: ruby/ruby-1/file.c
diff -u ruby/ruby-1/file.c:1.1.1.5 ruby/ruby-1/file.c:1.1.1.5.4.1
--- ruby/ruby-1/file.c:1.1.1.5	Sun Dec 27 01:28:12 1998
+++ ruby/ruby-1/file.c	Mon Jan 18 11:17:24 1999
@@ -54,6 +54,7 @@
  #include "macruby_missing.h"
  extern int fileno(FILE *stream);
  extern int utimes();
+ char* strdup(char*);
 #endif
 
 VALUE rb_cFile;
Index: ruby/ruby-1/gc.c
diff -u ruby/ruby-1/gc.c:1.1.1.7 ruby/ruby-1/gc.c:1.1.1.7.4.1
--- ruby/ruby-1/gc.c:1.1.1.7	Sun Dec 27 01:28:12 1998
+++ ruby/ruby-1/gc.c	Mon Jan 18 11:17:25 1999
@@ -393,7 +393,8 @@
     obj->as.basic.flags |= FL_MARK;
 
     if (FL_TEST(obj, FL_EXIVAR)) {
-	return rb_mark_generic_ivar((VALUE)obj);
+	rb_mark_generic_ivar((VALUE)obj);
+	return;
     }
 
     switch (obj->as.basic.flags & T_MASK) {
Index: ruby/ruby-1/hash.c
diff -u ruby/ruby-1/hash.c:1.1.1.5 ruby/ruby-1/hash.c:1.1.1.5.4.2
--- ruby/ruby-1/hash.c:1.1.1.5	Sun Dec 27 01:28:13 1998
+++ ruby/ruby-1/hash.c	Tue Jan 19 00:12:41 1999
@@ -21,6 +21,10 @@
 char *strchr _((char*,char));
 #endif
 
+#ifdef USE_CWGUSI
+char* strdup(const char*);
+#endif
+
 #define HASH_FREEZE   FL_USER1
 #define HASH_DELETED  FL_USER2
 
@@ -823,7 +827,6 @@
     return hash1;
 }
 
-#ifndef __MACOS__ /* no environment variables on MacOS. */
 static int path_tainted = -1;
 
 #ifndef NT
@@ -1314,8 +1317,6 @@
     }
     return hash;
 }
-
-#endif  /* ifndef __MACOS__  no environment variables on MacOS. */
 
 void
 Init_Hash()
Index: ruby/ruby-1/intern.h
diff -u ruby/ruby-1/intern.h:1.1.1.8 ruby/ruby-1/intern.h:1.1.1.8.4.1
--- ruby/ruby-1/intern.h:1.1.1.8	Sun Dec 27 01:28:13 1998
+++ ruby/ruby-1/intern.h	Mon Jan 18 11:17:25 1999
@@ -225,6 +225,7 @@
 void rb_set_kcode _((char*));
 int rb_ignorecase_p _((void));
 /* ruby.c */
+extern VALUE rb_argv0;
 void rb_load_file _((char*));
 void ruby_script _((char*));
 void ruby_prog_init _((void));
Index: ruby/ruby-1/io.c
diff -u ruby/ruby-1/io.c:1.1.1.8 ruby/ruby-1/io.c:1.1.1.8.4.1
--- ruby/ruby-1/io.c:1.1.1.8	Sun Dec 27 01:28:14 1998
+++ ruby/ruby-1/io.c	Mon Jan 18 11:17:25 1999
@@ -55,6 +55,7 @@
  #include <unix.mac.h>
  #include <compat.h>
  extern void Init_File();
+ extern char* strdup(const char*);
 #endif
 
 #ifdef __BEOS__
@@ -99,7 +100,7 @@
 #elif defined(__BEOS__)
 #  define ReadDataPending(fp) (fp->_state._eof == 0)
 #elif defined(USE_CWGUSI)
-#  define ReadDataPending(fp) (fp->state.eof == 0)
+#  define READ_DATA_PENDING(fp) (fp->state.eof == 0)
 #else
 /* requires systems own version of the ReadDataPending() */
 extern int ReadDataPending();
@@ -675,6 +676,7 @@
     GetOpenFile(io, fptr);
     rb_io_check_readable(fptr);
     fptr->lineno = NUM2INT(lineno);
+    return lineno;
 }
 
 static void
@@ -1011,9 +1013,9 @@
 	rb_sys_fail(fptr->path);
 # else  /* USE_CWGUSI */
 	if (fptr->f)
-		fptr->f->mode.binrb_ary_io = 1;
+		fptr->f->mode.binary_io = 1;
 	if (fptr->f2)
-		fptr->f2->mode.binrb_ary_io = 1;
+		fptr->f2->mode.binary_io = 1;
 # endif /* USE_CWGUSI */
 #endif
 
Index: ruby/ruby-1/main.c
diff -u ruby/ruby-1/main.c:1.1.1.1 ruby/ruby-1/main.c:1.1.1.1.22.2
--- ruby/ruby-1/main.c:1.1.1.1	Sat Sep  5 21:27:29 1998
+++ ruby/ruby-1/main.c	Thu Jan 21 13:49:28 1999
@@ -18,6 +18,10 @@
 int _stacksize = 131072;
 #endif
 
+#if defined(__MACOS__) && defined(__MWERKS__)
+#include <console.h>
+#endif
+
 int
 main(argc, argv, envp)
     int argc;
@@ -25,6 +29,9 @@
 {
 #if defined(NT)
     NtInitialize(&argc, &argv);
+#endif
+#if defined(__MACOS__) && defined(__MWERKS__)
+	argc = ccommand(&argv);
 #endif
 
     ruby_init();
Index: ruby/ruby-1/parse.c
diff -u ruby/ruby-1/parse.c:1.1.1.6 ruby/ruby-1/parse.c:1.1.1.6.4.1
--- ruby/ruby-1/parse.c:1.1.1.6	Sun Dec 27 01:28:18 1998
+++ ruby/ruby-1/parse.c	Thu Jan 21 13:49:28 1999
@@ -4577,6 +4577,10 @@
 	RSTRING(line)->ptr[RSTRING(line)->len-2] = '\n';
 	RSTRING(line)->len--;
     }
+#ifdef __MACOS__
+    else if (RSTRING(line)->ptr[RSTRING(line)->len-1] == '\r')
+	RSTRING(line)->ptr[RSTRING(line)->len-1] = '\n';
+#endif
 }
 
 static int
Index: ruby/ruby-1/parse.y
diff -u ruby/ruby-1/parse.y:1.1.1.8 ruby/ruby-1/parse.y:1.1.1.8.4.1
--- ruby/ruby-1/parse.y:1.1.1.8	Sun Dec 27 01:28:22 1998
+++ ruby/ruby-1/parse.y	Thu Jan 21 13:49:31 1999
@@ -1745,6 +1745,10 @@
 	RSTRING(line)->ptr[RSTRING(line)->len-2] = '\n';
 	RSTRING(line)->len--;
     }
+#ifdef __MACOS__
+    else if (RSTRING(line)->ptr[RSTRING(line)->len-1] == '\r')
+	RSTRING(line)->ptr[RSTRING(line)->len-1] = '\n';
+#endif
 }
 
 static int
Index: ruby/ruby-1/process.c
diff -u ruby/ruby-1/process.c:1.1.1.7 ruby/ruby-1/process.c:1.1.1.7.4.2
--- ruby/ruby-1/process.c:1.1.1.7	Sun Dec 27 01:28:23 1998
+++ ruby/ruby-1/process.c	Thu Jan 21 13:49:31 1999
@@ -138,7 +138,7 @@
 	    pid_tbl = st_init_numtable();
 	st_insert(pid_tbl, pid, st);
 #ifdef USE_THREAD
-	if (!thread_alone()) rb_thread_schedule();
+	if (!rb_thread_alone()) rb_thread_schedule();
 #endif
     }
 #endif
@@ -521,7 +521,7 @@
 rb_f_fork(obj)
     VALUE obj;
 {
-#if !defined(__human68k__)
+#if !defined(__human68k__) && !defined(__MACOS__)
     int pid;
 
     rb_secure(2);
@@ -670,7 +670,10 @@
     rb_last_status = state == -1 ? INT2FIX(127) : INT2FIX(state);
     return state == 0 ? Qtrue : Qfalse ;
 #else
-    volatile VALUE prog = 0;
+#if defined(USE_CWGUSI)
+    rb_notimplement();
+#else
+   volatile VALUE prog = 0;
     int pid;
     int i;
 
@@ -725,9 +728,10 @@
 
     if (rb_last_status == INT2FIX(0)) return Qtrue;
     return Qfalse;
-#endif
-#endif
-#endif
+#endif /* USE_CWGUSI */
+#endif /* __human68k__ */
+#endif /* DJGPP */
+#endif /* NT */
 }
 
 static VALUE
@@ -1032,13 +1036,11 @@
 #ifndef USE_CWGUSI
     rb_define_global_function("exec", rb_f_exec, -1);
 #endif
-#if !defined(NT) && !defined(USE_CWGUSI)
+#if !defined(NT)
     rb_define_global_function("fork", rb_f_fork, 0);
 #endif
     rb_define_global_function("exit!", rb_f_exit_bang, 1);
-#ifndef USE_CWGUSI
     rb_define_global_function("system", rb_f_system, -1);
-#endif
     rb_define_global_function("sleep", rb_f_sleep, -1);
 
     rb_mProcess = rb_define_module("Process");
@@ -1056,7 +1058,7 @@
 #endif
 #endif
 
-#if !defined(NT) && !defined(USE_CWGUSI)
+#if !defined(NT)
     rb_define_singleton_method(rb_mProcess, "fork", rb_f_fork, 0);
 #endif
     rb_define_singleton_method(rb_mProcess, "exit!", rb_f_exit_bang, 1);
Index: ruby/ruby-1/ruby.c
diff -u ruby/ruby-1/ruby.c:1.1.1.6 ruby/ruby-1/ruby.c:1.1.1.6.4.4
--- ruby/ruby-1/ruby.c:1.1.1.6	Sun Dec 27 01:28:24 1998
+++ ruby/ruby-1/ruby.c	Thu Jan 21 13:49:32 1999
@@ -28,10 +28,6 @@
 #include <unistd.h>
 #endif
 
-#ifdef __MWERKS__
-#include "node.h"
-#endif
-
 #ifdef USE_CWGUSI
 #include "macruby_missing.h"
 #endif
@@ -739,15 +735,16 @@
     rb_define_readonly_variable("$-l", &do_line);
 
     if (rb_safe_level() == 0) {
+#ifndef test__MACOS__
+	addpath(".");
+#else
 	addpath(".");
+#endif
     }
 
     addpath(RUBY_LIB);
 #if defined(_WIN32) || defined(DJGPP)
     addpath(ruby_libpath());
-#endif
-#ifdef __MACOS__
-    setup_macruby_libpath();
 #endif
 
 #ifdef RUBY_ARCHLIB
Index: ruby/ruby-1/signal.c
diff -u ruby/ruby-1/signal.c:1.1.1.4 ruby/ruby-1/signal.c:1.1.1.4.4.1
--- ruby/ruby-1/signal.c:1.1.1.4	Sun Dec 27 01:28:25 1998
+++ ruby/ruby-1/signal.c	Mon Jan 18 11:17:26 1999
@@ -507,7 +507,7 @@
 void
 rb_trap_restore_mask()
 {
-#ifndef NT
+#if !defined(NT) && !defined(USE_CWGUSI)
 # ifdef HAVE_SIGPROCMASK
     sigprocmask(SIG_SETMASK, &trap_last_mask, NULL);
 # else
Index: ruby/ruby-1/sprintf.c
diff -u ruby/ruby-1/sprintf.c:1.1.1.6 ruby/ruby-1/sprintf.c:1.1.1.6.4.1
--- ruby/ruby-1/sprintf.c:1.1.1.6	Sun Dec 27 01:28:25 1998
+++ ruby/ruby-1/sprintf.c	Mon Jan 18 11:17:26 1999
@@ -13,7 +13,11 @@
 #include "ruby.h"
 #include <ctype.h>
 
+#ifdef USE_CWGUSI
+static void fmt_setup();
+#else
 static void fmt_setup _((char*,char,int,int,int));
+#endif
 
 static char*
 remove_sign_bits(str, base)
Index: ruby/ruby-1/time.c
diff -u ruby/ruby-1/time.c:1.1.1.6 ruby/ruby-1/time.c:1.1.1.6.4.1
--- ruby/ruby-1/time.c:1.1.1.6	Sun Dec 27 01:28:26 1998
+++ ruby/ruby-1/time.c	Tue Jan 19 00:12:42 1999
@@ -79,8 +79,10 @@
     VALUE obj;
     struct time_object *tobj;
 
+#ifndef USE_CWGUSI
     if (sec < 0 || (sec == 0 && usec < 0))
 	rb_raise(rb_eArgError, "time must be positive");
+#endif
     obj = Data_Make_Struct(klass, struct time_object, 0, free, tobj);
     tobj->tm_got = 0;
     tobj->tv.tv_sec = sec;
Index: ruby/ruby-1/util.c
diff -u ruby/ruby-1/util.c:1.1.1.7 ruby/ruby-1/util.c:1.1.1.7.4.1
--- ruby/ruby-1/util.c:1.1.1.7	Sun Dec 27 01:28:27 1998
+++ ruby/ruby-1/util.c	Mon Jan 18 11:17:26 1999
@@ -19,6 +19,10 @@
 #include "missing/file.h"
 #endif
 
+#ifdef USE_CWGUSI
+extern char* mktemp(char*);
+#endif
+
 VALUE
 rb_class_of(obj)
     VALUE obj;

In This Thread

Prev Next