st: Fix build

k-takata · Mar 13, 2020 · 952558f · 952558f
1 parent 4b7ccef
commit 952558f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/regint.h b/regint.h
@@ -172,23 +172,23 @@
 
 # define CHECK_INTERRUPT_IN_MATCH_AT
 
-# define st_init_table                  onig_st_init_table
-# define st_init_table_with_size        onig_st_init_table_with_size
-# define st_init_numtable               onig_st_init_numtable
-# define st_init_numtable_with_size     onig_st_init_numtable_with_size
-# define st_init_strtable               onig_st_init_strtable
-# define st_init_strtable_with_size     onig_st_init_strtable_with_size
-# define st_delete                      onig_st_delete
-# define st_delete_safe                 onig_st_delete_safe
-# define st_insert                      onig_st_insert
-# define st_lookup                      onig_st_lookup
-# define st_foreach                     onig_st_foreach
-# define st_add_direct                  onig_st_add_direct
-# define st_free_table                  onig_st_free_table
-# define st_cleanup_safe                onig_st_cleanup_safe
-# define st_copy                        onig_st_copy
-# define st_nothing_key_clone           onig_st_nothing_key_clone
-# define st_nothing_key_free            onig_st_nothing_key_free
+# define rb_st_init_table                  onig_st_init_table
+# define rb_st_init_table_with_size        onig_st_init_table_with_size
+# define rb_st_init_numtable               onig_st_init_numtable
+# define rb_st_init_numtable_with_size     onig_st_init_numtable_with_size
+# define rb_st_init_strtable               onig_st_init_strtable
+# define rb_st_init_strtable_with_size     onig_st_init_strtable_with_size
+# define rb_st_delete                      onig_st_delete
+# define rb_st_delete_safe                 onig_st_delete_safe
+# define rb_st_insert                      onig_st_insert
+# define rb_st_lookup                      onig_st_lookup
+# define rb_st_foreach                     onig_st_foreach
+# define rb_st_add_direct                  onig_st_add_direct
+# define rb_st_free_table                  onig_st_free_table
+# define rb_st_cleanup_safe                onig_st_cleanup_safe
+# define rb_st_copy                        onig_st_copy
+# define rb_st_nothing_key_clone           onig_st_nothing_key_clone
+# define rb_st_nothing_key_free            onig_st_nothing_key_free
 /* */
 # define onig_st_is_member              st_is_member
 

diff --git a/st.c b/st.c
@@ -110,6 +110,7 @@
 #include "internal/hash.h"
 #include "internal/sanitizers.h"
 #else
+#include "regint.h"
 #include "st.h"
 #endif
 

diff --git a/st.h b/st.h
@@ -21,9 +21,8 @@ extern "C" {
 #ifdef RUBY
 #include "ruby/defines.h"
 #else /* RUBY */
-#ifdef HAVE_STDINT_H
 #include <stdint.h>
-#endif
+#include <stdlib.h>
 #ifndef RUBY_SYMBOL_EXPORT_BEGIN
 #define RUBY_SYMBOL_EXPORT_BEGIN
 #define RUBY_SYMBOL_EXPORT_END