1 files changed, 19 insertions, 20 deletions
diff --git a/include/ruby/util.h b/include/ruby/util.h
index 0c1e1c4ebc..3fecba8ebc 100644
--- a/include/ruby/util.h
+++ b/include/ruby/util.h
@@ -19,6 +19,11 @@ extern "C" {
 #endif
 #endif
 
+#include "ruby/defines.h"
+#ifdef RUBY_EXTCONF_H
+#include RUBY_EXTCONF_H
+#endif
+
 #ifndef _
 #ifdef __cplusplus
 # ifndef  HAVE_PROTOTYPES
@@ -40,46 +45,40 @@ extern "C" {
 #endif
 #endif
 
-#define scan_oct(s,l,e) (int)ruby_scan_oct(s,l,e)
+RUBY_SYMBOL_EXPORT_BEGIN
+
+#define DECIMAL_SIZE_OF_BITS(n) (((n) * 3010 + 9998) / 9999)
+/* an approximation of ceil(n * log10(2)), up to 65536 at least */
+
+#define scan_oct(s,l,e) ((int)ruby_scan_oct((s),(l),(e)))
 unsigned long ruby_scan_oct(const char *, size_t, size_t *);
-#define scan_hex(s,l,e) (int)ruby_scan_hex(s,l,e)
+#define scan_hex(s,l,e) ((int)ruby_scan_hex((s),(l),(e)))
 unsigned long ruby_scan_hex(const char *, size_t, size_t *);
 
-#if defined(__CYGWIN32__) || defined(_WIN32)
-void ruby_add_suffix(VALUE str, const char *suffix);
-#endif
-
+#ifdef HAVE_GNU_QSORT_R
+# define ruby_qsort qsort_r
+#else
 void ruby_qsort(void *, const size_t, const size_t,
 		int (*)(const void *, const void *, void *), void *);
+#endif
 
 void ruby_setenv(const char *, const char *);
 void ruby_unsetenv(const char *);
-#undef setenv
-#undef unsetenv
-#define setenv(name,val) ruby_setenv(name,val)
-#define unsetenv(name,val) ruby_unsetenv(name);
 
 char *ruby_strdup(const char *);
 #undef strdup
 #define strdup(s) ruby_strdup(s)
 
 char *ruby_getcwd(void);
-#define my_getcwd() ruby_getcwd()
 
 double ruby_strtod(const char *, char **);
 #undef strtod
-#define strtod(s,e) ruby_strtod(s,e)
-
-#if defined _MSC_VER && _MSC_VER >= 1300
-#pragma warning(push)
-#pragma warning(disable:4723)
-#endif
-#if defined _MSC_VER && _MSC_VER >= 1300
-#pragma warning(pop)
-#endif
+#define strtod(s,e) ruby_strtod((s),(e))
 
 void ruby_each_words(const char *, void (*)(const char*, int, void*), void *);
 
+RUBY_SYMBOL_EXPORT_END
+
 #if defined(__cplusplus)
 #if 0
 { /* satisfy cc-mode */