diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-12-04 21:57:35 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-12-04 21:57:35 +0000 |
commit | 7e6cecb76987cb1e61b20b1213dfd889ce8df930 (patch) | |
tree | 817100f7c70afaec29b353a7debd29354c1703aa /dln.c | |
parent | 01d06638b96eefdb5f6bd019289f1e479d3c5723 (diff) |
* dln.c (aix_loaderror): should not use member named 'errno' which
might be a macro (e.g. on AIX).
* io.c (read_all): do not depend on lseek position.
[ruby-dev:22026]
* eval.c (rb_eval): preserve $! value when retry happens in the
rescue clause. [ruby-talk:86697]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5113 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'dln.c')
-rw-r--r-- | dln.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1221,7 +1221,7 @@ aix_loaderror(const char *pathname) int i,j; struct errtab { - int errno; + int errnum; char *errstr; } load_errtab[] = { {L_ERROR_TOOMANY, "too many errors, rest skipped."}, @@ -1248,7 +1248,7 @@ aix_loaderror(const char *pathname) for(i = 0; message[i] && *message[i]; i++) { int nerr = atoi(message[i]); for (j=0; j<LOAD_ERRTAB_LEN; j++) { - if (nerr == load_errtab[i].errno && load_errtab[i].errstr) + if (nerr == load_errtab[i].errnum && load_errtab[i].errstr) ERRBUF_APPEND(load_errtab[i].errstr); } while (isdigit(*message[i])) message[i]++; |