diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-11-21 04:35:57 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-11-21 04:35:57 +0000 |
| commit | 9a7c25abab65e2a501e05676b6e4e53f0e9ff026 (patch) | |
| tree | 431674ddc65dd823e7203f85c44737d4b263d925 /ext/digest/sha2 | |
| parent | c964c738be8b5ad7b317918e8a89f7154666e565 (diff) | |
* 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/trunk@52694 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/digest/sha2')
| -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 |
3 files changed, 4 insertions, 6 deletions
diff --git a/ext/digest/sha2/extconf.rb b/ext/digest/sha2/extconf.rb index 142a7f7077..fe515457b7 100644 --- a/ext/digest/sha2/extconf.rb +++ b/ext/digest/sha2/extconf.rb @@ -6,7 +6,6 @@ require "mkmf" require File.expand_path("../../digest_conf", __FILE__) $defs << "-DHAVE_CONFIG_H" -$INCFLAGS << " -I$(srcdir)/.." $objs = [ "sha2init.#{$OBJEXT}" ] @@ -18,6 +17,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 1d29ee2d76..c86eab37a0 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 09ccee5ac4..9fd8ece7fe 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" #elif defined(SHA2_USE_COMMONDIGEST) |