eban

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

4 files changed, 15 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index caeade3dc1..ca975fa7ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sat Aug 26 01:37:09 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
+
+	* configure.in: check _mktemp.
+
+	* ruby.h: use _mktemp instead of mktemp if available.
+	  quiet ld warning.
+
 Thu Aug 24 15:27:39 2000  WATANABE Hirofumi  <eban@os.rim.or.jp>
 
 	* ext/socket/socketport.h: use `extern int h_errno' if needed.
diff --git a/configure b/configure
index 2b384f64c7..282fe7ee5a 100644
--- a/configure
+++ b/configure
@@ -2579,7 +2579,7 @@ else
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
-void *p = alloca(2 * sizeof(int));
+char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
 if { (eval echo configure:2586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
@@ -3143,7 +3143,7 @@ for ac_func in fmod killpg drand48 random wait4 waitpid syscall getcwd\
 	      truncate chsize times utimes fcntl lockf setitimer\
 	      setruid seteuid setreuid setrgid setegid setregid\
 	      getpgrp setpgrp getpgid setpgid getgroups getpriority\
-	      dlopen sigprocmask sigaction _setjmp setsid
+	      dlopen sigprocmask sigaction _setjmp setsid _mktemp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 echo "configure:3150: checking for $ac_func" >&5
@@ -3682,7 +3682,7 @@ else
 int main() {
 
 /* Ultrix mips cc rejects this.  */
-typedef int charset[2]; const charset x = {0,0};
+typedef int charset[2]; const charset x;
 /* SunOS 4.1.1 cc rejects this.  */
 char const *const *ccp;
 char **p;
diff --git a/configure.in b/configure.in
index 7f6f8fb6ac..744b19d096 100644
--- a/configure.in
+++ b/configure.in
@@ -198,7 +198,7 @@ AC_CHECK_FUNCS(fmod killpg drand48 random wait4 waitpid syscall getcwd\
 	      truncate chsize times utimes fcntl lockf setitimer\
 	      setruid seteuid setreuid setrgid setegid setregid\
 	      getpgrp setpgrp getpgid setpgid getgroups getpriority\
-	      dlopen sigprocmask sigaction _setjmp setsid)
+	      dlopen sigprocmask sigaction _setjmp setsid _mktemp)
 AC_STRUCT_TIMEZONE
 if test "$ac_cv_func_strftime" = no; then
     AC_TRY_LINK([],
diff --git a/ruby.h b/ruby.h
index 1597a43ab3..7db1baa8e5 100644
--- a/ruby.h
+++ b/ruby.h
@@ -19,6 +19,10 @@ extern "C" {
 #include "config.h"
 #include "defines.h"
 
+#if defined HAVE__MKTEMP && !defined mktemp
+#define mktemp _mktemp
+#endif
+
 #ifdef HAVE_STDLIB_H
 # include <stdlib.h>
 #endif