ruby-changes:40660
From: nagachika <ko1@a...>
Date: Wed, 25 Nov 2015 00:29:02 +0900 (JST)
Subject: [ruby-changes:40660] nagachika:r52739 (ruby_2_2): merge revision(s) 52694: [Backport #3231]
nagachika 2015-11-25 00:28:43 +0900 (Wed, 25 Nov 2015) New Revision: 52739 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=52739 Log: merge revision(s) 52694: [Backport #3231] * ext/digest/*/*.[ch]: include ruby.h before digest.h to avoid includeing ext/digest/extconf.h. [Bug #3231] https://msdn.microsoft.com/library/36k2cdd4.aspx * ext/digest/*/extconf.rb: remove ext/digest from include search path to avoid confusion of cl.exe. * ext/digest/*/*.[ch]: explicitly specify def.h's path. Modified directories: branches/ruby_2_2/ Modified files: branches/ruby_2_2/ChangeLog branches/ruby_2_2/ext/digest/bubblebabble/bubblebabble.c branches/ruby_2_2/ext/digest/bubblebabble/extconf.rb branches/ruby_2_2/ext/digest/md5/extconf.rb branches/ruby_2_2/ext/digest/md5/md5.h branches/ruby_2_2/ext/digest/md5/md5init.c branches/ruby_2_2/ext/digest/rmd160/extconf.rb branches/ruby_2_2/ext/digest/rmd160/rmd160.h branches/ruby_2_2/ext/digest/rmd160/rmd160init.c branches/ruby_2_2/ext/digest/sha1/extconf.rb branches/ruby_2_2/ext/digest/sha1/sha1.h branches/ruby_2_2/ext/digest/sha1/sha1init.c branches/ruby_2_2/ext/digest/sha2/extconf.rb branches/ruby_2_2/ext/digest/sha2/sha2.c branches/ruby_2_2/ext/digest/sha2/sha2init.c branches/ruby_2_2/ext/digest/sha2/sha2ossl.c branches/ruby_2_2/version.h Index: ruby_2_2/ChangeLog =================================================================== --- ruby_2_2/ChangeLog (revision 52738) +++ ruby_2_2/ChangeLog (revision 52739) @@ -1,3 +1,14 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1 +Wed Nov 25 00:14:28 2015 NARUSE, Yui <naruse@r...> + + * ext/digest/*/*.[ch]: include ruby.h before digest.h to avoid + includeing ext/digest/extconf.h. [Bug #3231] + https://msdn.microsoft.com/library/36k2cdd4.aspx + + * ext/digest/*/extconf.rb: remove ext/digest from include search path + to avoid confusion of cl.exe. + + * ext/digest/*/*.[ch]: explicitly specify def.h's path. + Wed Nov 25 00:03:42 2015 SHIBATA Hiroshi <hsbt@r...> * Added missing reference of GitHub Index: ruby_2_2/ext/digest/bubblebabble/bubblebabble.c =================================================================== --- ruby_2_2/ext/digest/bubblebabble/bubblebabble.c (revision 52738) +++ ruby_2_2/ext/digest/bubblebabble/bubblebabble.c (revision 52739) @@ -11,8 +11,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/digest/bubblebabble/bubblebabble.c#L11 ************************************************/ -#include "ruby.h" -#include "digest.h" +#include <ruby/ruby.h> +#include "../digest.h" static ID id_digest; Index: ruby_2_2/ext/digest/bubblebabble/extconf.rb =================================================================== --- ruby_2_2/ext/digest/bubblebabble/extconf.rb (revision 52738) +++ ruby_2_2/ext/digest/bubblebabble/extconf.rb (revision 52739) @@ -1,6 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/digest/bubblebabble/extconf.rb#L1 require 'mkmf' $defs << "-DHAVE_CONFIG_H" -$INCFLAGS << " -I$(srcdir)/.." create_makefile('digest/bubblebabble') Index: ruby_2_2/ext/digest/md5/extconf.rb =================================================================== --- ruby_2_2/ext/digest/md5/extconf.rb (revision 52738) +++ ruby_2_2/ext/digest/md5/extconf.rb (revision 52739) @@ -5,7 +5,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/digest/md5/extconf.rb#L5 require "mkmf" $defs << "-DHAVE_CONFIG_H" -$INCFLAGS << " -I$(srcdir)/.." $objs = [ "md5init.#{$OBJEXT}" ] Index: ruby_2_2/ext/digest/md5/md5init.c =================================================================== --- ruby_2_2/ext/digest/md5/md5init.c (revision 52738) +++ ruby_2_2/ext/digest/md5/md5init.c (revision 52739) @@ -1,7 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/digest/md5/md5init.c#L1 /* $RoughId: md5init.c,v 1.2 2001/07/13 19:49:10 knu Exp $ */ /* $Id$ */ -#include "digest.h" +#include <ruby/ruby.h> +#include "../digest.h" #if defined(HAVE_OPENSSL_MD5_H) #include "md5ossl.h" #else Index: ruby_2_2/ext/digest/md5/md5.h =================================================================== --- ruby_2_2/ext/digest/md5/md5.h (revision 52738) +++ ruby_2_2/ext/digest/md5/md5.h (revision 52739) @@ -46,7 +46,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/digest/md5/md5.h#L46 #ifndef MD5_INCLUDED # define MD5_INCLUDED -#include "defs.h" +#include "../defs.h" /* * This code has some adaptations for the Ghostscript environment, but it Index: ruby_2_2/ext/digest/rmd160/rmd160.h =================================================================== --- ruby_2_2/ext/digest/rmd160/rmd160.h (revision 52738) +++ ruby_2_2/ext/digest/rmd160/rmd160.h (revision 52739) @@ -26,7 +26,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/digest/rmd160/rmd160.h#L26 #ifndef _RMD160_H_ #define _RMD160_H_ -#include "defs.h" +#include "../defs.h" typedef struct { uint32_t state[5]; /* state (ABCDE) */ Index: ruby_2_2/ext/digest/rmd160/extconf.rb =================================================================== --- ruby_2_2/ext/digest/rmd160/extconf.rb (revision 52738) +++ ruby_2_2/ext/digest/rmd160/extconf.rb (revision 52739) @@ -5,7 +5,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/digest/rmd160/extconf.rb#L5 require "mkmf" $defs << "-DNDEBUG" << "-DHAVE_CONFIG_H" -$INCFLAGS << " -I$(srcdir)/.." $objs = [ "rmd160init.#{$OBJEXT}" ] Index: ruby_2_2/ext/digest/rmd160/rmd160init.c =================================================================== --- ruby_2_2/ext/digest/rmd160/rmd160init.c (revision 52738) +++ ruby_2_2/ext/digest/rmd160/rmd160init.c (revision 52739) @@ -1,7 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/digest/rmd160/rmd160init.c#L1 /* $RoughId: rmd160init.c,v 1.3 2001/07/13 20:00:43 knu Exp $ */ /* $Id$ */ -#include "digest.h" +#include <ruby/ruby.h> +#include "../digest.h" #if defined(HAVE_OPENSSL_RIPEMD_H) #include "rmd160ossl.h" #else Index: ruby_2_2/ext/digest/sha1/sha1init.c =================================================================== --- ruby_2_2/ext/digest/sha1/sha1init.c (revision 52738) +++ ruby_2_2/ext/digest/sha1/sha1init.c (revision 52739) @@ -1,7 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/digest/sha1/sha1init.c#L1 /* $RoughId: sha1init.c,v 1.2 2001/07/13 19:49:10 knu Exp $ */ /* $Id$ */ -#include "digest.h" +#include <ruby/ruby.h> +#include "../digest.h" #if defined(HAVE_OPENSSL_SHA_H) #include "sha1ossl.h" #else Index: ruby_2_2/ext/digest/sha1/sha1.h =================================================================== --- ruby_2_2/ext/digest/sha1/sha1.h (revision 52738) +++ ruby_2_2/ext/digest/sha1/sha1.h (revision 52739) @@ -11,7 +11,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/digest/sha1/sha1.h#L11 #ifndef _SYS_SHA1_H_ #define _SYS_SHA1_H_ -#include "defs.h" +#include "../defs.h" typedef struct { uint32_t state[5]; Index: ruby_2_2/ext/digest/sha1/extconf.rb =================================================================== --- ruby_2_2/ext/digest/sha1/extconf.rb (revision 52738) +++ ruby_2_2/ext/digest/sha1/extconf.rb (revision 52739) @@ -5,7 +5,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/digest/sha1/extconf.rb#L5 require "mkmf" $defs << "-DHAVE_CONFIG_H" -$INCFLAGS << " -I$(srcdir)/.." $objs = [ "sha1init.#{$OBJEXT}" ] Index: ruby_2_2/ext/digest/sha2/sha2ossl.c =================================================================== --- ruby_2_2/ext/digest/sha2/sha2ossl.c (revision 52738) +++ ruby_2_2/ext/digest/sha2/sha2ossl.c (revision 52739) @@ -1,4 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/digest/sha2/sha2ossl.c#L1 -#include "defs.h" +#include "../defs.h" #include "sha2ossl.h" #define SHA_Finish(bit) \ Index: ruby_2_2/ext/digest/sha2/sha2init.c =================================================================== --- ruby_2_2/ext/digest/sha2/sha2init.c (revision 52738) +++ ruby_2_2/ext/digest/sha2/sha2init.c (revision 52739) @@ -1,7 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/digest/sha2/sha2init.c#L1 /* $RoughId: sha2init.c,v 1.3 2001/07/13 20:00:43 knu Exp $ */ /* $Id$ */ -#include "digest.h" +#include <ruby/ruby.h> +#include "../digest.h" #if defined(SHA2_USE_OPENSSL) #include "sha2ossl.h" #else Index: ruby_2_2/ext/digest/sha2/extconf.rb =================================================================== --- ruby_2_2/ext/digest/sha2/extconf.rb (revision 52738) +++ ruby_2_2/ext/digest/sha2/extconf.rb (revision 52739) @@ -5,7 +5,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/digest/sha2/extconf.rb#L5 require "mkmf" $defs << "-DHAVE_CONFIG_H" -$INCFLAGS << " -I$(srcdir)/.." $objs = [ "sha2init.#{$OBJEXT}" ] @@ -27,6 +26,4 @@ have_header("sys/cdefs.h") https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/digest/sha2/extconf.rb#L26 $preload = %w[digest] -if have_type("uint64_t", "defs.h", $defs.join(' ')) - create_makefile("digest/sha2") -end +create_makefile("digest/sha2") Index: ruby_2_2/ext/digest/sha2/sha2.c =================================================================== --- ruby_2_2/ext/digest/sha2/sha2.c (revision 52738) +++ ruby_2_2/ext/digest/sha2/sha2.c (revision 52739) @@ -34,7 +34,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/digest/sha2/sha2.c#L34 * $Id$ */ -#include "defs.h" +#include "../defs.h" #include <string.h> /* memcpy()/memset() or bcopy()/bzero() */ #include <assert.h> /* assert() */ #include "sha2.h" Index: ruby_2_2/version.h =================================================================== --- ruby_2_2/version.h (revision 52738) +++ ruby_2_2/version.h (revision 52739) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1 #define RUBY_VERSION "2.2.4" #define RUBY_RELEASE_DATE "2015-11-25" -#define RUBY_PATCHLEVEL 195 +#define RUBY_PATCHLEVEL 196 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 11 Property changes on: ruby_2_2 ___________________________________________________________________ Modified: svn:mergeinfo Merged /trunk:r52694 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/