archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-18 01:54:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

merge revision(s) 34261,34351:

Browse source 
------------------------------------------------------------------------
r34261 | nobu | 2012-01-10 15:52:24 +0900 (Tue, 10 Jan 2012) | 2 lines

* gc.c (HEAP_OBJ_LIMIT): suppress narrowing down warning from gcc 4.2.

------------------------------------------------------------------------

	* include/ruby/ruby.h (FIXNUM_P): simple flag should be int.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34617 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2012-02-15 01:36:49 +00:00
parent e56eea5e37
commit 7b7aa9f573
4 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Wed Feb 15 10:35:43 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* include/ruby/ruby.h (FIXNUM_P): simple flag should be int.
Wed Feb 15 10:33:41 2012 Eric Hodel <drbrain@segment7.net> Wed Feb 15 10:33:41 2012 Eric Hodel <drbrain@segment7.net>
* vm_eval.c (check_funcall): Call respond_to? with matching arity for * vm_eval.c (check_funcall): Call respond_to? with matching arity for

2
gc.c
View file

@ -512,7 +512,7 @@ rb_objspace_free(rb_objspace_t *objspace)
/* 2KB */ /* 2KB */
/*#define HEAP_SIZE 0x800 */ /*#define HEAP_SIZE 0x800 */
#define HEAP_OBJ_LIMIT (HEAP_SIZE / sizeof(struct RVALUE)) #define HEAP_OBJ_LIMIT (unsigned int)(HEAP_SIZE / sizeof(struct RVALUE))
extern st_table *rb_class_tbl; extern st_table *rb_class_tbl;

2
include/ruby/ruby.h
View file

@ -335,7 +335,7 @@ rb_long2int(long n) {rb_long2int_internal(n, i); return i;}
#define FIX2LONG(x) (long)RSHIFT((SIGNED_VALUE)(x),1) #define FIX2LONG(x) (long)RSHIFT((SIGNED_VALUE)(x),1)
#define FIX2ULONG(x) ((((VALUE)(x))>>1)&LONG_MAX) #define FIX2ULONG(x) ((((VALUE)(x))>>1)&LONG_MAX)
#define FIXNUM_P(f) (((SIGNED_VALUE)(f))&FIXNUM_FLAG) #define FIXNUM_P(f) (((int)(SIGNED_VALUE)(f))&FIXNUM_FLAG)
#define POSFIXABLE(f) ((f) < FIXNUM_MAX+1) #define POSFIXABLE(f) ((f) < FIXNUM_MAX+1)
#define NEGFIXABLE(f) ((f) >= FIXNUM_MIN) #define NEGFIXABLE(f) ((f) >= FIXNUM_MIN)
#define FIXABLE(f) (POSFIXABLE(f) && NEGFIXABLE(f)) #define FIXABLE(f) (POSFIXABLE(f) && NEGFIXABLE(f))

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.3" #define RUBY_VERSION "1.9.3"
#define RUBY_PATCHLEVEL 119 #define RUBY_PATCHLEVEL 120
#define RUBY_RELEASE_DATE "2012-02-15" #define RUBY_RELEASE_DATE "2012-02-15"
#define RUBY_RELEASE_YEAR 2012 #define RUBY_RELEASE_YEAR 2012