1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_4@553 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 1999-10-25 05:09:13 +00:00
parent 74dcd0fac7
commit c431dc685e
12 changed files with 22 additions and 14 deletions

2
configure vendored
View file

@ -4093,7 +4093,7 @@ echo "configure:4028: checking whether OS depend dynamic link works" >&5
rb_cv_dlopen=yes ;; rb_cv_dlopen=yes ;;
esac ;; esac ;;
bsdi*) LDSHARED="ld -shared" 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 ;; rb_cv_dlopen=yes ;;
nextstep*) LDSHARED='cc -r -nostdlib' nextstep*) LDSHARED='cc -r -nostdlib'
LDFLAGS="-u libsys_s" LDFLAGS="-u libsys_s"

View file

@ -437,7 +437,7 @@ if test "$with_dln_a_out" != yes; then
rb_cv_dlopen=yes ;; rb_cv_dlopen=yes ;;
esac ;; esac ;;
bsdi*) LDSHARED="ld -shared" 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 ;; rb_cv_dlopen=yes ;;
nextstep*) LDSHARED='cc -r -nostdlib' nextstep*) LDSHARED='cc -r -nostdlib'
LDFLAGS="-u libsys_s" LDFLAGS="-u libsys_s"

View file

@ -1,5 +1,6 @@
MANIFEST MANIFEST
curses.c curses.c
depend
extconf.rb extconf.rb
hello.rb hello.rb
rain.rb rain.rb

View file

@ -3,6 +3,7 @@ README
README.expect README.expect
README.expect.jp README.expect.jp
README.jp README.jp
depend
expect_sample.rb expect_sample.rb
extconf.rb extconf.rb
lib/expect.rb lib/expect.rb

View file

@ -1,4 +1,5 @@
MANIFEST MANIFEST
README README
depend
extconf.rb extconf.rb
readline.c readline.c

View file

@ -1,5 +1,6 @@
MANIFEST MANIFEST
_sdbm.c _sdbm.c
depend
extconf.rb extconf.rb
init.c init.c
sdbm.h sdbm.h

View file

@ -82,7 +82,7 @@ VALUE rb_singleton_class _((VALUE));
/* enum.c */ /* enum.c */
VALUE rb_enum_length _((VALUE)); VALUE rb_enum_length _((VALUE));
/* error.c */ /* error.c */
extern int ruby_nerrs; EXTERN int ruby_nerrs;
VALUE rb_exc_new _((VALUE, const char*, long)); VALUE rb_exc_new _((VALUE, const char*, long));
VALUE rb_exc_new2 _((VALUE, const char*)); VALUE rb_exc_new2 _((VALUE, const char*));
VALUE rb_exc_new3 _((VALUE, VALUE)); VALUE rb_exc_new3 _((VALUE, VALUE));

6
io.c
View file

@ -452,15 +452,15 @@ io_fread(ptr, len, f)
int c; int c;
while (n--) { while (n--) {
if (!READ_DATA_PENDING(f)) {
rb_thread_wait_fd(fileno(f));
}
c = getc(f); c = getc(f);
if (c == EOF) { if (c == EOF) {
*ptr = '\0'; *ptr = '\0';
break; break;
} }
*ptr++ = c; *ptr++ = c;
if (!READ_DATA_PENDING(f)) {
rb_thread_wait_fd(fileno(f));
}
} }
return len - n - 1; return len - n - 1;

View file

@ -180,12 +180,7 @@ The variable ruby-indent-level controls the amount of indentation.
(back-to-indentation) (back-to-indentation)
(setq top (current-column)) (setq top (current-column))
(skip-chars-backward " \t") (skip-chars-backward " \t")
(cond (if (>= shift top) (setq shift (- shift top)))
((>= x shift)
(setq shift 0))
((>= shift top)
(setq shift (- shift top)))
(t (setq shift 0)))
(if (and (bolp) (if (and (bolp)
(= x top)) (= x top))
(move-to-column (+ x shift)) (move-to-column (+ x shift))

8
node.h
View file

@ -13,6 +13,10 @@
#ifndef NODE_H #ifndef NODE_H
#define NODE_H #define NODE_H
#if defined(__cplusplus)
extern "C" {
#endif
enum node_type { enum node_type {
NODE_METHOD, NODE_METHOD,
NODE_FBODY, NODE_FBODY,
@ -331,4 +335,8 @@ VALUE rb_gvar_get _((struct global_entry *));
VALUE rb_gvar_set _((struct global_entry *, VALUE)); VALUE rb_gvar_set _((struct global_entry *, VALUE));
VALUE rb_gvar_defined _((struct global_entry *)); VALUE rb_gvar_defined _((struct global_entry *));
#if defined(__cplusplus)
} /* extern "C" { */
#endif
#endif #endif

View file

@ -644,7 +644,7 @@ rb_f_system(argc, argv)
fflush(stderr); fflush(stderr);
if (argc == 0) { if (argc == 0) {
rb_last_status = INT2FIX(0); rb_last_status = INT2FIX(0);
return INT2FIX(0); rb_raise(rb_eArgError, "wrong # of arguments");
} }
if (TYPE(argv[0]) == T_ARRAY) { if (TYPE(argv[0]) == T_ARRAY) {
@ -675,7 +675,7 @@ rb_f_system(argc, argv)
fflush(stderr); fflush(stderr);
if (argc == 0) { if (argc == 0) {
rb_last_status = INT2FIX(0); rb_last_status = INT2FIX(0);
return INT2FIX(0); rb_raise(rb_eArgError, "wrong # of arguments");
} }
if (TYPE(argv[0]) == T_ARRAY) { if (TYPE(argv[0]) == T_ARRAY) {

View file

@ -31,6 +31,7 @@ EXPORTS
rb_eSystemCallError rb_eSystemCallError
rb_eZeroDivError rb_eZeroDivError
rb_mErrno rb_mErrno
ruby_nerrs
;eval.c ;eval.c
rb_cProc rb_cProc
ruby_frame ruby_frame