diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-11-24 15:28:43 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-11-24 15:28:43 +0000 |
commit | 2c30e876c43debeb2736dc40b96fb82268d2ea49 (patch) | |
tree | 752f34c2cea8ec657d4c83d3668613d4fe9f12af | |
parent | ae2b1d2fe1fbb43f46588a949c892576a0918e54 (diff) |
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.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52739 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 11 | ||||
-rw-r--r-- | ext/digest/bubblebabble/bubblebabble.c | 4 | ||||
-rw-r--r-- | ext/digest/bubblebabble/extconf.rb | 1 | ||||
-rw-r--r-- | ext/digest/md5/extconf.rb | 1 | ||||
-rw-r--r-- | ext/digest/md5/md5.h | 2 | ||||
-rw-r--r-- | ext/digest/md5/md5init.c | 3 | ||||
-rw-r--r-- | ext/digest/rmd160/extconf.rb | 1 | ||||
-rw-r--r-- | ext/digest/rmd160/rmd160.h | 2 | ||||
-rw-r--r-- | ext/digest/rmd160/rmd160init.c | 3 | ||||
-rw-r--r-- | ext/digest/sha1/extconf.rb | 1 | ||||
-rw-r--r-- | ext/digest/sha1/sha1.h | 2 | ||||
-rw-r--r-- | ext/digest/sha1/sha1init.c | 3 | ||||
-rw-r--r-- | ext/digest/sha2/extconf.rb | 5 | ||||
-rw-r--r-- | ext/digest/sha2/sha2.c | 2 | ||||
-rw-r--r-- | ext/digest/sha2/sha2init.c | 3 | ||||
-rw-r--r-- | ext/digest/sha2/sha2ossl.c | 2 | ||||
-rw-r--r-- | version.h | 2 |
17 files changed, 28 insertions, 20 deletions
@@ -1,3 +1,14 @@ +Wed Nov 25 00:14:28 2015 NARUSE, Yui <naruse@ruby-lang.org> + + * 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@ruby-lang.org> * Added missing reference of GitHub diff --git a/ext/digest/bubblebabble/bubblebabble.c b/ext/digest/bubblebabble/bubblebabble.c index 4bccd221b8..4b8263de5a 100644 --- a/ext/digest/bubblebabble/bubblebabble.c +++ b/ext/digest/bubblebabble/bubblebabble.c @@ -11,8 +11,8 @@ ************************************************/ -#include "ruby.h" -#include "digest.h" +#include <ruby/ruby.h> +#include "../digest.h" static ID id_digest; diff --git a/ext/digest/bubblebabble/extconf.rb b/ext/digest/bubblebabble/extconf.rb index 53cb83934a..1214add293 100644 --- a/ext/digest/bubblebabble/extconf.rb +++ b/ext/digest/bubblebabble/extconf.rb @@ -1,6 +1,5 @@ require 'mkmf' $defs << "-DHAVE_CONFIG_H" -$INCFLAGS << " -I$(srcdir)/.." create_makefile('digest/bubblebabble') diff --git a/ext/digest/md5/extconf.rb b/ext/digest/md5/extconf.rb index dbef0878ca..a4e30d5356 100644 --- a/ext/digest/md5/extconf.rb +++ b/ext/digest/md5/extconf.rb @@ -5,7 +5,6 @@ require "mkmf" $defs << "-DHAVE_CONFIG_H" -$INCFLAGS << " -I$(srcdir)/.." $objs = [ "md5init.#{$OBJEXT}" ] diff --git a/ext/digest/md5/md5.h b/ext/digest/md5/md5.h index a0faa25e48..1b3383c5ee 100644 --- a/ext/digest/md5/md5.h +++ b/ext/digest/md5/md5.h @@ -46,7 +46,7 @@ #ifndef MD5_INCLUDED # define MD5_INCLUDED -#include "defs.h" +#include "../defs.h" /* * This code has some adaptations for the Ghostscript environment, but it diff --git a/ext/digest/md5/md5init.c b/ext/digest/md5/md5init.c index 3cf0c1a203..cda31c6af1 100644 --- a/ext/digest/md5/md5init.c +++ b/ext/digest/md5/md5init.c @@ -1,7 +1,8 @@ /* $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 diff --git a/ext/digest/rmd160/extconf.rb b/ext/digest/rmd160/extconf.rb index 64ffbd7dc8..5081cea897 100644 --- a/ext/digest/rmd160/extconf.rb +++ b/ext/digest/rmd160/extconf.rb @@ -5,7 +5,6 @@ require "mkmf" $defs << "-DNDEBUG" << "-DHAVE_CONFIG_H" -$INCFLAGS << " -I$(srcdir)/.." $objs = [ "rmd160init.#{$OBJEXT}" ] diff --git a/ext/digest/rmd160/rmd160.h b/ext/digest/rmd160/rmd160.h index 098fa05a88..6324709d96 100644 --- a/ext/digest/rmd160/rmd160.h +++ b/ext/digest/rmd160/rmd160.h @@ -26,7 +26,7 @@ #ifndef _RMD160_H_ #define _RMD160_H_ -#include "defs.h" +#include "../defs.h" typedef struct { uint32_t state[5]; /* state (ABCDE) */ diff --git a/ext/digest/rmd160/rmd160init.c b/ext/digest/rmd160/rmd160init.c index 572638bb7c..3ab3a4826a 100644 --- a/ext/digest/rmd160/rmd160init.c +++ b/ext/digest/rmd160/rmd160init.c @@ -1,7 +1,8 @@ /* $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 diff --git a/ext/digest/sha1/extconf.rb b/ext/digest/sha1/extconf.rb index c230270e1b..26689a1c78 100644 --- a/ext/digest/sha1/extconf.rb +++ b/ext/digest/sha1/extconf.rb @@ -5,7 +5,6 @@ require "mkmf" $defs << "-DHAVE_CONFIG_H" -$INCFLAGS << " -I$(srcdir)/.." $objs = [ "sha1init.#{$OBJEXT}" ] diff --git a/ext/digest/sha1/sha1.h b/ext/digest/sha1/sha1.h index 6f1c388cf2..2accc46d46 100644 --- a/ext/digest/sha1/sha1.h +++ b/ext/digest/sha1/sha1.h @@ -11,7 +11,7 @@ #ifndef _SYS_SHA1_H_ #define _SYS_SHA1_H_ -#include "defs.h" +#include "../defs.h" typedef struct { uint32_t state[5]; diff --git a/ext/digest/sha1/sha1init.c b/ext/digest/sha1/sha1init.c index 56ae0fae86..69b93723b3 100644 --- a/ext/digest/sha1/sha1init.c +++ b/ext/digest/sha1/sha1init.c @@ -1,7 +1,8 @@ /* $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 diff --git a/ext/digest/sha2/extconf.rb b/ext/digest/sha2/extconf.rb index ac35132250..12fbbc4144 100644 --- a/ext/digest/sha2/extconf.rb +++ b/ext/digest/sha2/extconf.rb @@ -5,7 +5,6 @@ require "mkmf" $defs << "-DHAVE_CONFIG_H" -$INCFLAGS << " -I$(srcdir)/.." $objs = [ "sha2init.#{$OBJEXT}" ] @@ -27,6 +26,4 @@ have_header("sys/cdefs.h") $preload = %w[digest] -if have_type("uint64_t", "defs.h", $defs.join(' ')) - create_makefile("digest/sha2") -end +create_makefile("digest/sha2") diff --git a/ext/digest/sha2/sha2.c b/ext/digest/sha2/sha2.c index d0629a2b64..0cd3b0f24e 100644 --- a/ext/digest/sha2/sha2.c +++ b/ext/digest/sha2/sha2.c @@ -34,7 +34,7 @@ * $Id$ */ -#include "defs.h" +#include "../defs.h" #include <string.h> /* memcpy()/memset() or bcopy()/bzero() */ #include <assert.h> /* assert() */ #include "sha2.h" diff --git a/ext/digest/sha2/sha2init.c b/ext/digest/sha2/sha2init.c index 8a5faeee57..38467df12c 100644 --- a/ext/digest/sha2/sha2init.c +++ b/ext/digest/sha2/sha2init.c @@ -1,7 +1,8 @@ /* $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 diff --git a/ext/digest/sha2/sha2ossl.c b/ext/digest/sha2/sha2ossl.c index 34353be8b8..e68828899c 100644 --- a/ext/digest/sha2/sha2ossl.c +++ b/ext/digest/sha2/sha2ossl.c @@ -1,4 +1,4 @@ -#include "defs.h" +#include "../defs.h" #include "sha2ossl.h" #define SHA_Finish(bit) \ @@ -1,6 +1,6 @@ #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 |