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/md5 | |
| 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/md5')
| -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 |
3 files changed, 3 insertions, 3 deletions
diff --git a/ext/digest/md5/extconf.rb b/ext/digest/md5/extconf.rb index 5140325b8f..05a990cdd2 100644 --- a/ext/digest/md5/extconf.rb +++ b/ext/digest/md5/extconf.rb @@ -6,7 +6,6 @@ require "mkmf" require File.expand_path("../../digest_conf", __FILE__) $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 bcd332d648..a6afedef69 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(MD5_USE_OPENSSL) #include "md5ossl.h" #elif defined(MD5_USE_COMMONDIGEST) |