inline fix

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1113 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
lann · Jan 10, 2001 · 3ea9ef0 · 3ea9ef0
1 parent 4c09e12
commit 3ea9ef0
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/gc.c b/gc.c
@@ -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;
 {

diff --git a/pack.c b/pack.c
@@ -1026,7 +1026,7 @@ qpencode(str, from, len)
     }
 }
 
-static INLINE int
+static inline int
 hex2num(c)
     char c;
 {

diff --git a/parse.y b/parse.y
@@ -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;

diff --git a/ruby.h b/ruby.h
@@ -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"
-Original file line number
+Diff line change
@@ Expand Up / @@ -1026,7 +1026,7 @@ qpencode(str, from, len) @@
         }
     }
-    static INLINE int
+    static inline int
     hex2num(c)
         char c;
     {
@@ Expand Down @@