diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-01-10 10:07:31 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-01-10 10:07:31 +0000 |
commit | 3b9557fda087643e155432c5055aea1f76c54fb6 (patch) | |
tree | f436ade55218d83f2154f34d7f91f7e5403ebc72 | |
parent | 6e525927d9bf89145236db65ad4795f9fc7b42a6 (diff) | |
download | ruby-3b9557fda087643e155432c5055aea1f76c54fb6.tar.gz ruby-3b9557fda087643e155432c5055aea1f76c54fb6.tar.xz ruby-3b9557fda087643e155432c5055aea1f76c54fb6.zip |
inline fix
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@1113 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | gc.c | 2 | ||||
-rw-r--r-- | pack.c | 2 | ||||
-rw-r--r-- | parse.y | 4 | ||||
-rw-r--r-- | ruby.h | 20 |
4 files changed, 14 insertions, 14 deletions
@@ -315,7 +315,7 @@ rb_data_object_alloc(klass, datap, dmark, dfree) extern st_table *rb_class_tbl; VALUE *rb_gc_stack_start = 0; -static INLINE int +static inline int is_pointer_to_heap(ptr) void *ptr; { @@ -1026,7 +1026,7 @@ qpencode(str, from, len) } } -static INLINE int +static inline int hex2num(c) char c; { @@ -1849,6 +1849,8 @@ none : /* none */ #include "regex.h" #include "util.h" +#define enc ruby_default_encoding + /* We remove any previous definition of `SIGN_EXTEND_CHAR', since ours (we hope) works properly with all combinations of machines, compilers, `char' and `unsigned char' argument types. @@ -2045,7 +2047,7 @@ rb_compile_file(f, file, start) return yycompile(strdup(f), start); } -static INLINE int +static inline int nextc() { int c; @@ -539,15 +539,14 @@ EXTERN VALUE rb_eNameError; EXTERN VALUE rb_eSyntaxError; EXTERN VALUE rb_eLoadError; -extern INLINE VALUE rb_class_of _((VALUE)); -extern INLINE int rb_type _((VALUE)); -extern INLINE int rb_special_const_p _((VALUE)); +extern inline VALUE rb_class_of _((VALUE)); +extern inline int rb_type _((VALUE)); +extern inline int rb_special_const_p _((VALUE)); -#if defined(HAVE_INLINE) || defined(RUBY_NO_INLINE) #ifndef RUBY_NO_INLINE -extern +extern inline #endif -INLINE VALUE +VALUE rb_class_of(VALUE obj) { if (FIXNUM_P(obj)) return rb_cFixnum; @@ -560,9 +559,9 @@ rb_class_of(VALUE obj) } #ifndef RUBY_NO_INLINE -extern +extern inline #endif -INLINE int +int rb_type(VALUE obj) { if (FIXNUM_P(obj)) return T_FIXNUM; @@ -575,15 +574,14 @@ rb_type(VALUE obj) } #ifndef RUBY_NO_INLINE -extern +extern inline #endif -INLINE int +int rb_special_const_p(VALUE obj) { if (SPECIAL_CONST_P(obj)) return Qtrue; return Qfalse; } -#endif #include "intern.h" |