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 /ext/digest/rmd160 | |
| 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
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 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 |