* 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

ChangeLog

@@ -1,3 +1,14 @@
+Sat Nov 21 13:31:52 2015  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* 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.
+
 Sat Nov 21 13:05:16 2015  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* ext/openssl/ossl.h: LibreSSL doesn't have and need e_os2.h.

ext/digest/bubblebabble/bubblebabble.c

@@ -11,8 +11,8 @@
 
 ************************************************/
 
-#include "ruby.h"
+#include <ruby/ruby.h>
-#include "digest.h"
+#include "../digest.h"
 
 static ID id_digest;
 

ext/digest/bubblebabble/extconf.rb

@@ -1,6 +1,5 @@
 require 'mkmf'
 
 $defs << "-DHAVE_CONFIG_H"
-$INCFLAGS << " -I$(srcdir)/.."
 
 create_makefile('digest/bubblebabble')

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}" ]
 

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

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)

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}" ]
 

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) */

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

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}" ]
 

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];

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)

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")
-  create_makefile("digest/sha2")
-end

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"

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)