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/sha1 | |
| parent | c964c738be8b5ad7b317918e8a89f7154666e565 (diff) | |
| download | ruby-9a7c25abab65e2a501e05676b6e4e53f0e9ff026.tar.gz | |
* 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/sha1')
| -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 |
3 files changed, 3 insertions, 3 deletions
diff --git a/ext/digest/sha1/extconf.rb b/ext/digest/sha1/extconf.rb index 7528fb2de3..84690e8ea5 100644 --- a/ext/digest/sha1/extconf.rb +++ b/ext/digest/sha1/extconf.rb @@ -6,7 +6,6 @@ require "mkmf" require File.expand_path("../../digest_conf", __FILE__) $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 1f0580883f..1f8b89e276 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(SHA1_USE_OPENSSL) #include "sha1ossl.h" #elif defined(SHA1_USE_COMMONDIGEST) |