[前][次][番号順一覧][スレッド一覧]

ruby-changes:16909

From: akr <ko1@a...>
Date: Sat, 7 Aug 2010 19:05:52 +0900 (JST)
Subject: [ruby-changes:16909] Ruby:r28905 (trunk): * missing/close.c: undef the macros "getpeername", "getsockname" and

akr	2010-08-07 19:05:37 +0900 (Sat, 07 Aug 2010)

  New Revision: 28905

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

  Log:
    * missing/close.c: undef the macros "getpeername", "getsockname" and
      "shutdown" to prevent infinite recursion.

  Modified files:
    trunk/ChangeLog
    trunk/missing/close.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 28904)
+++ ChangeLog	(revision 28905)
@@ -1,3 +1,8 @@
+Sat Aug  7 19:04:49 2010  Tanaka Akira  <akr@f...>
+
+	* missing/close.c: undef the macros "getpeername", "getsockname" and
+	  "shutdown" to prevent infinite recursion.
+
 Sat Aug  7 18:37:39 2010  Tanaka Akira  <akr@f...>
 
 	* missing/close.c: undef the macro "close" to prevent infinite
Index: missing/close.c
===================================================================
--- missing/close.c	(revision 28904)
+++ missing/close.c	(revision 28905)
@@ -5,6 +5,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 
+#undef getpeername
 int
 ruby_getpeername(int s, struct sockaddr * name,
          socklen_t * namelen)
@@ -21,6 +22,7 @@
     return s;
 }
 
+#undef getsockname
 int
 ruby_getsockname(int s, struct sockaddr * name,
          socklen_t * namelen)
@@ -37,6 +39,7 @@
     return s;
 }
 
+#undef shutdown
 int
 ruby_shutdown(int s, int how)
 {
@@ -52,12 +55,12 @@
     return s;
 }
 
+#undef close
 int
 ruby_close(int s)
 {
     int err = errno;
     errno = 0;
-#undef close
     s = close(s);
     if (errno == ECONNRESET) {
 	errno = 0;

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

[前][次][番号順一覧][スレッド一覧]