1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* gc.c (is_pointer_to_heap): avoid GCC 3.1 warnings.

* missing/strftime.c (timezone): it should take no argument on Cygwin.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_6@2456 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
eban 2002-05-14 06:10:51 +00:00
parent 81120f9375
commit b739ba7175
4 changed files with 15 additions and 5 deletions

View file

@ -1,3 +1,9 @@
Tue May 14 14:49:05 2002 WATANABE Hirofumi <eban@ruby-lang.org>
* gc.c (is_pointer_to_heap): avoid GCC 3.1 warnings.
* missing/strftime.c (timezone): it should take no argument on Cygwin.
Tue May 14 09:15:39 2002 Yukihiro Matsumoto <matz@ruby-lang.org> Tue May 14 09:15:39 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (blk_orphan): the wrong condition; backported from 1.7 * eval.c (blk_orphan): the wrong condition; backported from 1.7

6
gc.c
View file

@ -416,7 +416,7 @@ mark_locations_array(x, n)
register long n; register long n;
{ {
while (n--) { while (n--) {
if (is_pointer_to_heap(*x)) { if (is_pointer_to_heap((void *)*x)) {
rb_gc_mark(*x); rb_gc_mark(*x);
} }
x++; x++;
@ -478,7 +478,7 @@ void
rb_gc_mark_maybe(obj) rb_gc_mark_maybe(obj)
VALUE obj; VALUE obj;
{ {
if (is_pointer_to_heap(obj)) { if (is_pointer_to_heap((void *)obj)) {
rb_gc_mark(obj); rb_gc_mark(obj);
} }
} }
@ -1362,7 +1362,7 @@ id2ref(obj, id)
} }
ptr = id ^ FIXNUM_FLAG; /* unset FIXNUM_FLAG */ ptr = id ^ FIXNUM_FLAG; /* unset FIXNUM_FLAG */
if (!is_pointer_to_heap(ptr)) { if (!is_pointer_to_heap((void *)ptr)) {
rb_raise(rb_eRangeError, "0x%x is not id value", p0); rb_raise(rb_eRangeError, "0x%x is not id value", p0);
} }
if (BUILTIN_TYPE(ptr) == 0) { if (BUILTIN_TYPE(ptr) == 0) {

View file

@ -446,8 +446,12 @@ strftime(char *s, size_t maxsize, const char *format, const struct tm *timeptr)
strcpy(tbuf, timeptr->tm_name); strcpy(tbuf, timeptr->tm_name);
#else #else
gettimeofday(& tv, & zone); gettimeofday(& tv, & zone);
#ifdef __CYGWIN__
strcpy(tbuf, timezone());
#else
strcpy(tbuf, timezone(zone.tz_minuteswest, strcpy(tbuf, timezone(zone.tz_minuteswest,
timeptr->tm_isdst > 0)); timeptr->tm_isdst > 0));
#endif
#endif /* HAVE_TM_NAME */ #endif /* HAVE_TM_NAME */
#endif /* HAVE_TM_ZONE */ #endif /* HAVE_TM_ZONE */
#endif /* HAVE_TZNAME */ #endif /* HAVE_TZNAME */

View file

@ -1,4 +1,4 @@
#define RUBY_VERSION "1.6.7" #define RUBY_VERSION "1.6.7"
#define RUBY_RELEASE_DATE "2002-05-10" #define RUBY_RELEASE_DATE "2002-05-14"
#define RUBY_VERSION_CODE 167 #define RUBY_VERSION_CODE 167
#define RUBY_RELEASE_CODE 20020510 #define RUBY_RELEASE_CODE 20020514