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/rmd160 | |
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/rmd160')
-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 |
3 files changed, 3 insertions, 3 deletions
diff --git a/ext/digest/rmd160/extconf.rb b/ext/digest/rmd160/extconf.rb index 49c26b0945..15fd095cf2 100644 --- a/ext/digest/rmd160/extconf.rb +++ b/ext/digest/rmd160/extconf.rb @@ -6,7 +6,6 @@ require "mkmf" require File.expand_path("../../digest_conf", __FILE__) $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 7aa835ddfc..c1e753cc11 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(RMD160_USE_OPENSSL) #include "rmd160ossl.h" #else |