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

ruby-changes:19042

From: akr <ko1@a...>
Date: Thu, 10 Mar 2011 03:01:18 +0900 (JST)
Subject: [ruby-changes:19042] Ruby:r31080 (trunk): * ext/openssl/ossl_ssl.c: parenthesize macro arguments.

akr	2011-03-10 03:01:11 +0900 (Thu, 10 Mar 2011)

  New Revision: 31080

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

  Log:
    * ext/openssl/ossl_ssl.c: parenthesize macro arguments.

  Modified files:
    trunk/ChangeLog
    trunk/ext/openssl/ossl_ssl.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 31079)
+++ ChangeLog	(revision 31080)
@@ -1,3 +1,7 @@
+Thu Mar 10 03:00:43 2011  Tanaka Akira  <akr@f...>
+
+	* ext/openssl/ossl_ssl.c: parenthesize macro arguments.
+
 Wed Mar  9 23:51:26 2011  CHIKANAGA Tomoyuki  <nagachika00@g...>
 
 	* test/ruby/test_io_m17n.rb (test_io_new_enc): "sjis" is now an alias
Index: ext/openssl/ossl_ssl.c
===================================================================
--- ext/openssl/ossl_ssl.c	(revision 31079)
+++ ext/openssl/ossl_ssl.c	(revision 31080)
@@ -16,12 +16,12 @@
 #  include <unistd.h> /* for read(), and write() */
 #endif
 
-#define numberof(ary) (int)(sizeof(ary)/sizeof(ary[0]))
+#define numberof(ary) (int)(sizeof(ary)/sizeof((ary)[0]))
 
 #ifdef _WIN32
 #  define TO_SOCKET(s) _get_osfhandle(s)
 #else
-#  define TO_SOCKET(s) s
+#  define TO_SOCKET(s) (s)
 #endif
 
 VALUE mSSL;
@@ -1064,9 +1064,9 @@
 }
 
 #ifdef _WIN32
-#define ssl_get_error(ssl, ret) (errno = rb_w32_map_errno(WSAGetLastError()), SSL_get_error(ssl, ret))
+#define ssl_get_error(ssl, ret) (errno = rb_w32_map_errno(WSAGetLastError()), SSL_get_error((ssl), (ret)))
 #else
-#define ssl_get_error(ssl, ret) SSL_get_error(ssl, ret)
+#define ssl_get_error(ssl, ret) SSL_get_error((ssl), (ret))
 #endif
 
 static void

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

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