Use #ifdef for all changes we have in headers

Author: eregon

lib/cext/include/ruby/onigmo.h

@@ -331,6 +331,7 @@ int enc_is_unicode(const OnigEncodingType *enc);
 #define ONIGENC_IS_UNICODE(enc)        ((enc)->flags & ONIGENC_FLAG_UNICODE)
 #endif
 
+
 #define ONIGENC_NAME(enc)                      ((enc)->name)
 
 #ifdef TRUFFLERUBY

lib/cext/include/ruby/st.h

@@ -143,6 +143,10 @@ CONSTFUNC(st_index_t st_hash_end(st_index_t h));
 CONSTFUNC(st_index_t st_hash_start(st_index_t h));
 #define st_hash_start(h) ((st_index_t)(h))
 
+#ifndef TRUFFLERUBY
+void rb_hash_bulk_insert_into_st_table(long, const VALUE *, VALUE);
+#endif
+
 RUBY_SYMBOL_EXPORT_END
 
 #if defined(__cplusplus)

lib/cext/include/ruby/subst.h

@@ -3,6 +3,9 @@
 
 #undef snprintf
 #undef vsnprintf
+#ifndef TRUFFLERUBY
+#define snprintf ruby_snprintf
+#endif
 
 #define vsnprintf ruby_vsnprintf
 

lib/cext/include/ruby/thread.h

@@ -23,10 +23,20 @@ extern "C" {
 
 RUBY_SYMBOL_EXPORT_BEGIN
 
+#ifdef TRUFFLERUBY
 void *rb_thread_call_with_gvl(gvl_call function, void *data1);
 
-void *rb_thread_call_without_gvl(gvl_call function, void *data1, rb_unblock_function_t *unblock_function, void *data2);
+void *rb_thread_call_without_gvl(gvl_call function, void *data1,
+                                 rb_unblock_function_t *unblock_function, void *data2);
 #define rb_thread_call_without_gvl2 rb_thread_call_without_gvl
+#else
+void *rb_thread_call_with_gvl(void *(*func)(void *), void *data1);
+
+void *rb_thread_call_without_gvl(void *(*func)(void *), void *data1,
+				 rb_unblock_function_t *ubf, void *data2);
+void *rb_thread_call_without_gvl2(void *(*func)(void *), void *data1,
+				  rb_unblock_function_t *ubf, void *data2);
+#endif
 
 #define RUBY_CALL_WO_GVL_FLAG_SKIP_CHECK_INTS_AFTER 0x01
 #define RUBY_CALL_WO_GVL_FLAG_SKIP_CHECK_INTS_