ruby-changes:19110
From: akr <ko1@a...>
Date: Tue, 22 Mar 2011 20:14:58 +0900 (JST)
Subject: [ruby-changes:19110] Ruby:r31149 (trunk): * ext/openssl/ruby_missing.h: parenthesize macro arguments.
akr 2011-03-22 20:09:43 +0900 (Tue, 22 Mar 2011) New Revision: 31149 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=31149 Log: * ext/openssl/ruby_missing.h: parenthesize macro arguments. Modified files: trunk/ChangeLog trunk/ext/openssl/ruby_missing.h Index: ChangeLog =================================================================== --- ChangeLog (revision 31148) +++ ChangeLog (revision 31149) @@ -1,3 +1,7 @@ +Sun Mar 20 12:43:12 2011 Tanaka Akira <akr@f...> + + * ext/openssl/ruby_missing.h: parenthesize macro arguments. + Tue Mar 22 13:33:22 2011 NAKAMURA, Hiroshi <nahi@r...> * ext/openssl/lib/openssl/buffering.rb: removed circular require of Index: ext/openssl/ruby_missing.h =================================================================== --- ext/openssl/ruby_missing.h (revision 31148) +++ ext/openssl/ruby_missing.h (revision 31149) @@ -12,11 +12,11 @@ #define _OSSL_RUBY_MISSING_H_ #define rb_define_copy_func(klass, func) \ - rb_define_method(klass, "initialize_copy", func, 1) + rb_define_method((klass), "initialize_copy", (func), 1) #ifndef GetReadFile -#define FPTR_TO_FD(fptr) (fptr->fd) +#define FPTR_TO_FD(fptr) ((fptr)->fd) #else #define FPTR_TO_FD(fptr) (fileno(GetReadFile(fptr))) #endif @@ -28,14 +28,14 @@ #ifndef HAVE_RB_STR_SET_LEN /* these methods should probably be backported to 1.8 */ #define rb_str_set_len(str, length) do { \ - RSTRING(str)->ptr[length] = 0; \ - RSTRING(str)->len = length; \ + RSTRING(str)->ptr[(length)] = 0; \ + RSTRING(str)->len = (length); \ } while(0) #endif /* ! HAVE_RB_STR_SET_LEN */ #ifndef HAVE_RB_BLOCK_CALL /* the openssl module doesn't use arg[3-4] and arg2 is always rb_each */ -#define rb_block_call(arg1, arg2, arg3, arg4, arg5, arg6) rb_iterate(rb_each, arg1, arg5, arg6) +#define rb_block_call(arg1, arg2, arg3, arg4, arg5, arg6) rb_iterate(rb_each, (arg1), (arg5), (arg6)) #endif /* ! HAVE_RB_BLOCK_CALL */ #endif /* _OSSL_RUBY_MISSING_H_ */ -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/