Skip to content

Commit

Permalink
* array.c (rb_ary_transpose): Properly declare ary as a VALUE.
Browse files Browse the repository at this point in the history
* file.c (rb_file_s_chmod): Do not directly cast an int to void *
  to avoid a warning.

* defines.h (FLUSH_REGISTER_WINDOWS): Add support for
  FreeBSD/sparc64.  miniruby still coredumps in a different place,
  though.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@3250 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information
knu committed Dec 31, 2002
1 parent d1bfddc commit a61b7b0
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 2 deletions.
11 changes: 11 additions & 0 deletions ChangeLog
@@ -1,3 +1,14 @@
Tue Dec 31 19:21:02 2002 Akinori MUSHA <knu@iDaemons.org>

* array.c (rb_ary_transpose): Properly declare ary as a VALUE.

* file.c (rb_file_s_chmod): Do not directly cast an int to void *
to avoid a warning.

* defines.h (FLUSH_REGISTER_WINDOWS): Add support for
FreeBSD/sparc64. miniruby still coredumps in a different place,
though.

Tue Dec 31 07:47:15 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>

* parse.y (parse_string): readjusted.
Expand Down
1 change: 1 addition & 0 deletions array.c
Expand Up @@ -1334,6 +1334,7 @@ rb_ary_zip(argc, argv, ary)

static VALUE
rb_ary_transpose(ary)
VALUE ary;
{
long elen = -1, alen, i, j;
VALUE tmp, result;
Expand Down
4 changes: 3 additions & 1 deletion defines.h
Expand Up @@ -140,7 +140,9 @@ void xfree _((void*));
#if defined(sparc) || defined(__sparc__)
# if defined(linux) || defined(__linux__)
#define FLUSH_REGISTER_WINDOWS asm("ta 0x83")
# else /* Solaris, not sparc linux */
# elif defined(__FreeBSD__) && defined(__sparc64__)
#define FLUSH_REGISTER_WINDOWS asm volatile("flushw" : :)
# else /* Solaris, OpenBSD, NetBSD, etc. */
#define FLUSH_REGISTER_WINDOWS asm("ta 0x03")
# endif /* trap always to flush register windows if we are on a Sparc system */
#else /* Not a sparc, so */
Expand Down
2 changes: 1 addition & 1 deletion file.c
Expand Up @@ -990,7 +990,7 @@ rb_file_s_chmod(argc, argv)
rb_scan_args(argc, argv, "1*", &vmode, &rest);
mode = NUM2INT(vmode);

n = apply2files(chmod_internal, rest, (void *)mode);
n = apply2files(chmod_internal, rest, (void *)(long)mode);
return LONG2FIX(n);
}

Expand Down

0 comments on commit a61b7b0

Please sign in to comment.