Remove the last usage of MUST_INLINE

Author: eregon

CHANGELOG.md

@@ -71,6 +71,7 @@ Bug fixes:
 * Fixed argument handling in `Kernel.printf`.
 * Fixed character length after conversion to binary from a non-US-ASCII String.
 * Fixed issue with installing latest bundler (#1880).
+* Fixed linking of always-inline C API functions with `-std=gnu90` (#1837, #1879).
 
 Compatibility:
 

lib/cext/include/truffleruby/truffleruby-pre.h

@@ -44,8 +44,6 @@ typedef VALUE ID;
 extern void* rb_tr_cext;
 #define RUBY_CEXT rb_tr_cext
 
-#define MUST_INLINE __attribute__((always_inline)) inline
-
 // Wrapping and unwrapping of values.
 
 extern void* (*rb_tr_unwrap)(VALUE obj);

lib/cext/include/truffleruby/truffleruby.h

@@ -90,8 +90,6 @@ if (polyglot_as_boolean(polyglot_invoke(RUBY_CEXT, "warning?"))) { \
 } \
 } while (0);
 
-MUST_INLINE int rb_tr_scan_args(int argc, VALUE *argv, const char *format, VALUE *v1, VALUE *v2, VALUE *v3, VALUE *v4, VALUE *v5, VALUE *v6, VALUE *v7, VALUE *v8, VALUE *v9, VALUE *v10);
-
 #define rb_tr_scan_args_1(ARGC, ARGV, FORMAT, V1) rb_tr_scan_args(ARGC, ARGV, FORMAT, V1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL)
 #define rb_tr_scan_args_2(ARGC, ARGV, FORMAT, V1, V2) rb_tr_scan_args(ARGC, ARGV, FORMAT, V1, V2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL)
 #define rb_tr_scan_args_3(ARGC, ARGV, FORMAT, V1, V2, V3) rb_tr_scan_args(ARGC, ARGV, FORMAT, V1, V2, V3, NULL, NULL, NULL, NULL, NULL, NULL, NULL)
@@ -164,7 +162,8 @@ VALUE rb_ivar_lookup(VALUE object, const char *name, VALUE default_value);
 
 // Inline implementations
 
-MUST_INLINE int rb_tr_scan_args(int argc, VALUE *argv, const char *format, VALUE *v1, VALUE *v2, VALUE *v3, VALUE *v4, VALUE *v5, VALUE *v6, VALUE *v7, VALUE *v8, VALUE *v9, VALUE *v10) {
+ALWAYS_INLINE(static int rb_tr_scan_args(int argc, VALUE *argv, const char *format, VALUE *v1, VALUE *v2, VALUE *v3, VALUE *v4, VALUE *v5, VALUE *v6, VALUE *v7, VALUE *v8, VALUE *v9, VALUE *v10));
+static inline int rb_tr_scan_args(int argc, VALUE *argv, const char *format, VALUE *v1, VALUE *v2, VALUE *v3, VALUE *v4, VALUE *v5, VALUE *v6, VALUE *v7, VALUE *v8, VALUE *v9, VALUE *v10) {
   // Parse the format string
 
   // TODO CS 7-Feb-17 maybe we could inline cache this part?