mame	2010-08-04 18:49:51 +0900 (Wed, 04 Aug 2010)

  New Revision: 28852

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=28852

  Log:
    merges r28754, r28756 and r28777 from trunk into ruby_1_9_2.
    These are needed to fix build failure on windows.  [ruby-dev:41929]
    --
    * configure.in: not [freebsd] but [freebsd*] for AS_CASE.
    
    * configure.in: define BROKEN_CLOSE only on FreeBSD.
      This needs to merge to 1.9.2.
    
    * configure.in: define BROKEN_CLOSE on FreeBSD.
      This fixes build failure on MSVC. [ruby-core:31481]
    
    * include/ruby/ruby.h, include/ruby/missing.h:
      use BROKEN_CLOSE for replacing close(2).

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/configure.in
    branches/ruby_1_9_2/include/ruby/missing.h
    branches/ruby_1_9_2/include/ruby/ruby.h

Index: ruby_1_9_2/include/ruby/missing.h
===================================================================
--- ruby_1_9_2/include/ruby/missing.h	(revision 28851)
+++ ruby_1_9_2/include/ruby/missing.h	(revision 28852)
@@ -169,7 +169,7 @@
 RUBY_EXTERN int ffs(int);
 #endif
 
-#ifndef HAVE_CLOSE
+#ifdef BROKEN_CLOSE
 #include <sys/types.h>
 #include <sys/socket.h>
 RUBY_EXTERN int ruby_getpeername(int, struct sockaddr *, socklen_t *);
Index: ruby_1_9_2/include/ruby/ruby.h
===================================================================
--- ruby_1_9_2/include/ruby/ruby.h	(revision 28851)
+++ ruby_1_9_2/include/ruby/ruby.h	(revision 28852)
@@ -1422,7 +1422,7 @@
 #define snprintf ruby_snprintf
 #define vsnprintf ruby_vsnprintf
 
-#ifdef __FreeBSD__
+#ifdef BROKEN_CLOSE
 #undef getpeername
 #define getpeername ruby_getpeername
 #undef getsockname
Index: ruby_1_9_2/configure.in
===================================================================
--- ruby_1_9_2/configure.in	(revision 28851)
+++ ruby_1_9_2/configure.in	(revision 28852)
@@ -1144,7 +1144,10 @@
 	rb_cv_broken_glibc_ia64_erfc=no)])
 AS_CASE([$rb_cv_broken_glibc_ia64_erfc],[yes],[ac_cv_func_erf=no])
 
-AS_CASE(["$target_os"],[freebsd],[],[AC_REPLACE_FUNCS(close)])
+AS_CASE(["$target_os"],[freebsd*],[
+	 AC_DEFINE(BROKEN_CLOSE)
+	 AC_REPLACE_FUNCS(close)
+	 ])
 AC_REPLACE_FUNCS(dup2 memmove strerror\
 		 strchr strstr crypt flock\
 		 isnan finite isinf hypot acosh erf tgamma lgamma_r cbrt \
Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 28851)
+++ ruby_1_9_2/ChangeLog	(revision 28852)
@@ -1,3 +1,20 @@
+Thu Jul 29 02:38:09 2010  NARUSE, Yui  <naruse@r...>
+
+	* configure.in: not [freebsd] but [freebsd*] for AS_CASE.
+
+Mon Jul 26 13:52:25 2010  NARUSE, Yui  <naruse@r...>
+
+	* configure.in: define BROKEN_CLOSE only on FreeBSD.
+	  This needs to merge to 1.9.2.
+
+Mon Jul 26 11:51:01 2010  NARUSE, Yui  <naruse@r...>
+
+	* configure.in: define BROKEN_CLOSE on FreeBSD.
+	  This fixes build failure on MSVC. [ruby-core:31481]
+
+	* include/ruby/ruby.h, include/ruby/missing.h:
+	  use BROKEN_CLOSE for replacing close(2).
+
 Mon Aug  2 00:03:18 2010  Yusuke Endoh  <mame@t...>
 
 	* util.c (ruby_add_suffix): fixed a bug returning uninitialized value.

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/