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/trunk@2454 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
6ed7cf2f1b
commit
c5d6a1ba48
4 changed files with 15 additions and 5 deletions
|
@ -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.
|
||||
|
||||
Mon May 13 14:38:33 2002 WATANABE Hirofumi <eban@ruby-lang.org>
|
||||
|
||||
* djgpp/config.hin, djgpp/config.sed: catch up with the latest change.
|
||||
|
|
6
gc.c
6
gc.c
|
@ -521,7 +521,7 @@ mark_locations_array(x, n)
|
|||
register long n;
|
||||
{
|
||||
while (n--) {
|
||||
if (is_pointer_to_heap(*x)) {
|
||||
if (is_pointer_to_heap((void *)*x)) {
|
||||
rb_gc_mark(*x);
|
||||
}
|
||||
x++;
|
||||
|
@ -583,7 +583,7 @@ void
|
|||
rb_gc_mark_maybe(obj)
|
||||
VALUE obj;
|
||||
{
|
||||
if (is_pointer_to_heap(obj)) {
|
||||
if (is_pointer_to_heap((void *)obj)) {
|
||||
rb_gc_mark(obj);
|
||||
}
|
||||
}
|
||||
|
@ -1508,7 +1508,7 @@ id2ref(obj, id)
|
|||
}
|
||||
|
||||
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);
|
||||
}
|
||||
if (BUILTIN_TYPE(ptr) == 0) {
|
||||
|
|
|
@ -447,8 +447,12 @@ strftime(char *s, size_t maxsize, const char *format, const struct tm *timeptr)
|
|||
strcpy(tbuf, timeptr->tm_name);
|
||||
#else
|
||||
gettimeofday(& tv, & zone);
|
||||
#ifdef __CYGWIN__
|
||||
strcpy(tbuf, timezone());
|
||||
#else
|
||||
strcpy(tbuf, timezone(zone.tz_minuteswest,
|
||||
timeptr->tm_isdst > 0));
|
||||
#endif
|
||||
#endif /* HAVE_TM_NAME */
|
||||
#endif /* HAVE_TM_ZONE */
|
||||
#endif /* HAVE_TZNAME */
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#define RUBY_VERSION "1.7.2"
|
||||
#define RUBY_RELEASE_DATE "2002-05-12"
|
||||
#define RUBY_RELEASE_DATE "2002-05-14"
|
||||
#define RUBY_VERSION_CODE 172
|
||||
#define RUBY_RELEASE_CODE 20020512
|
||||
#define RUBY_RELEASE_CODE 20020514
|
||||
|
|
Loading…
Reference in a new issue