join 1.1c6

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/v1_1dev@310 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 14 insertions, 3 deletions

diff --git a/util.h b/util.h
index 9697c17261..756daeeac6 100644
--- a/util.h
+++ b/util.h
@@ -12,16 +12,27 @@
 #ifndef UTIL_H
 #define UTIL_H
 
+#ifndef _
+# ifdef __STDC__
+#  define _(args) args
+# else
+#  define _(args) ()
+# endif
+#endif
+
 #define scan_oct ruby_scan_oct
-unsigned long scan_oct();
+unsigned long scan_oct _((char*, int, int*));
 #define scan_hex ruby_scan_hex
-unsigned long scan_hex();
+unsigned long scan_hex _((char*, int, int*));
 
 #if defined(MSDOS) || defined(__CYGWIN32__) || defined(NT)
 #define add_suffix ruby_add_suffix
 void add_suffix();
 #endif
 
-char *ruby_mktemp();
+char *ruby_mktemp _((void));
+
+void ruby_qsort _((void*, int, int, int (*)()));
+#define qsort(b,n,s,c) ruby_qsort(b,n,s,c)
 
 #endif /* UTIL_H */