19991025

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

12 files changed, 22 insertions, 14 deletions

diff --git a/configure b/configure
index 462280501c..9fcad96c20 100644
--- a/configure
+++ b/configure
@@ -4093,7 +4093,7 @@ echo "configure:4028: checking whether OS depend dynamic link works" >&5
 					rb_cv_dlopen=yes ;;
 			esac ;;
 	bsdi*)		LDSHARED="ld -shared"
-			LDFLAGS="-rdynamic -Wl,-rpath,/usr/local/lib/ruby/1.4/i386-bsdi4.0"
+			LDFLAGS='-rdynamic -Wl,-rpath,$(prefix)/lib/ruby/$(MAJOR).$(MINOR)/i386-bsdi4.0'
 			rb_cv_dlopen=yes ;;
 	nextstep*)	LDSHARED='cc -r -nostdlib'
 			LDFLAGS="-u libsys_s"
diff --git a/configure.in b/configure.in
index 00b6ff12ce..96e3c66d3b 100644
--- a/configure.in
+++ b/configure.in
@@ -437,7 +437,7 @@ if test "$with_dln_a_out" != yes; then
 					rb_cv_dlopen=yes ;;
 			esac ;;
 	bsdi*)		LDSHARED="ld -shared"
-			LDFLAGS="-rdynamic -Wl,-rpath,/usr/local/lib/ruby/1.4/i386-bsdi4.0"
+			LDFLAGS='-rdynamic -Wl,-rpath,$(prefix)/lib/ruby/$(MAJOR).$(MINOR)/i386-bsdi4.0'
 			rb_cv_dlopen=yes ;;
 	nextstep*)	LDSHARED='cc -r -nostdlib'
 			LDFLAGS="-u libsys_s"
diff --git a/ext/curses/MANIFEST b/ext/curses/MANIFEST
index db5e54ffe8..e1a25d962d 100644
--- a/ext/curses/MANIFEST
+++ b/ext/curses/MANIFEST
@@ -1,5 +1,6 @@
 MANIFEST
 curses.c
+depend
 extconf.rb
 hello.rb
 rain.rb
diff --git a/ext/pty/MANIFEST b/ext/pty/MANIFEST
index 5e5af7dd6b..f46d611e5b 100644
--- a/ext/pty/MANIFEST
+++ b/ext/pty/MANIFEST
@@ -3,6 +3,7 @@ README
 README.expect
 README.expect.jp
 README.jp
+depend
 expect_sample.rb
 extconf.rb
 lib/expect.rb
diff --git a/ext/readline/MANIFEST b/ext/readline/MANIFEST
index f73a899abb..f8bfd1ea2c 100644
--- a/ext/readline/MANIFEST
+++ b/ext/readline/MANIFEST
@@ -1,4 +1,5 @@
 MANIFEST
 README
+depend
 extconf.rb
 readline.c
diff --git a/ext/sdbm/MANIFEST b/ext/sdbm/MANIFEST
index d0ed99ba77..8888e69ad4 100644
--- a/ext/sdbm/MANIFEST
+++ b/ext/sdbm/MANIFEST
@@ -1,5 +1,6 @@
 MANIFEST
 _sdbm.c
+depend
 extconf.rb
 init.c
 sdbm.h
diff --git a/intern.h b/intern.h
index 4bfefa2fd1..6d7de17ead 100644
--- a/intern.h
+++ b/intern.h
@@ -82,7 +82,7 @@ VALUE rb_singleton_class _((VALUE));
 /* enum.c */
 VALUE rb_enum_length _((VALUE));
 /* error.c */
-extern int ruby_nerrs;
+EXTERN int ruby_nerrs;
 VALUE rb_exc_new _((VALUE, const char*, long));
 VALUE rb_exc_new2 _((VALUE, const char*));
 VALUE rb_exc_new3 _((VALUE, VALUE));
diff --git a/io.c b/io.c
index ae5634e25b..8ee1683385 100644
--- a/io.c
+++ b/io.c
@@ -452,15 +452,15 @@ io_fread(ptr, len, f)
     int c;
 
     while (n--) {
+	if (!READ_DATA_PENDING(f)) {
+	    rb_thread_wait_fd(fileno(f));
+	}
 	c = getc(f);
 	if (c == EOF) {
 	    *ptr = '\0';
 	    break;
 	}
 	*ptr++ = c;
-	if (!READ_DATA_PENDING(f)) {
-	    rb_thread_wait_fd(fileno(f));
-	}
     }
 
     return len - n - 1;
diff --git a/misc/ruby-mode.el b/misc/ruby-mode.el
index 50e4f50e87..aef84affea 100644
--- a/misc/ruby-mode.el
+++ b/misc/ruby-mode.el
@@ -180,12 +180,7 @@ The variable ruby-indent-level controls the amount of indentation.
 	(back-to-indentation)
 	(setq top (current-column))
 	(skip-chars-backward " \t")
-	(cond
-	 ((>= x shift)
-	  (setq shift 0))
-	 ((>= shift top)
-	  (setq shift (- shift top)))
-	 (t (setq shift 0)))
+	(if (>= shift top) (setq shift (- shift top)))
 	(if (and (bolp)
 		 (= x top))
 	    (move-to-column (+ x shift))
diff --git a/node.h b/node.h
index 4add37b47c..ea44a454d5 100644
--- a/node.h
+++ b/node.h
@@ -13,6 +13,10 @@
 #ifndef NODE_H
 #define NODE_H
 
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
 enum node_type {
     NODE_METHOD,
     NODE_FBODY,
@@ -331,4 +335,8 @@ VALUE rb_gvar_get _((struct global_entry *));
 VALUE rb_gvar_set _((struct global_entry *, VALUE));
 VALUE rb_gvar_defined _((struct global_entry *));
 
+#if defined(__cplusplus)
+}  /* extern "C" { */
+#endif
+
 #endif
diff --git a/process.c b/process.c
index d5c2d5eb8a..57b4300ea4 100644
--- a/process.c
+++ b/process.c
@@ -644,7 +644,7 @@ rb_f_system(argc, argv)
     fflush(stderr);
     if (argc == 0) {
 	rb_last_status = INT2FIX(0);
-	return INT2FIX(0);
+	rb_raise(rb_eArgError, "wrong # of arguments");
     }
 
     if (TYPE(argv[0]) == T_ARRAY) {
@@ -675,7 +675,7 @@ rb_f_system(argc, argv)
     fflush(stderr);
     if (argc == 0) {
 	rb_last_status = INT2FIX(0);
-	return INT2FIX(0);
+	rb_raise(rb_eArgError, "wrong # of arguments");
     }
 
     if (TYPE(argv[0]) == T_ARRAY) {
diff --git a/win32/ruby.def b/win32/ruby.def
index 1c79697fd7..008452fa8d 100644
--- a/win32/ruby.def
+++ b/win32/ruby.def
@@ -31,6 +31,7 @@ EXPORTS
 	rb_eSystemCallError
 	rb_eZeroDivError
 	rb_mErrno
+	ruby_nerrs
 ;eval.c
 	rb_cProc
 	ruby_frame