ruby-changes:16364
From: knu <ko1@a...>
Date: Wed, 16 Jun 2010 18:38:36 +0900 (JST)
Subject: [ruby-changes:16364] Ruby:r28341 (ruby_1_9_2): * ext/digest: Work around a build problem with VC++ 2010, likely
knu 2010-06-16 18:38:14 +0900 (Wed, 16 Jun 2010) New Revision: 28341 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=28341 Log: * ext/digest: Work around a build problem with VC++ 2010, likely due to a bug of its cl.exe. [Bug #3231] Modified files: branches/ruby_1_9_2/ChangeLog branches/ruby_1_9_2/ext/digest/bubblebabble/bubblebabble.c branches/ruby_1_9_2/ext/digest/bubblebabble/extconf.rb branches/ruby_1_9_2/ext/digest/md5/extconf.rb branches/ruby_1_9_2/ext/digest/md5/md5.h branches/ruby_1_9_2/ext/digest/md5/md5init.c branches/ruby_1_9_2/ext/digest/rmd160/extconf.rb branches/ruby_1_9_2/ext/digest/rmd160/rmd160.h branches/ruby_1_9_2/ext/digest/rmd160/rmd160init.c branches/ruby_1_9_2/ext/digest/rmd160/rmd160ossl.c branches/ruby_1_9_2/ext/digest/sha1/extconf.rb branches/ruby_1_9_2/ext/digest/sha1/sha1.h branches/ruby_1_9_2/ext/digest/sha1/sha1init.c branches/ruby_1_9_2/ext/digest/sha1/sha1ossl.c branches/ruby_1_9_2/ext/digest/sha2/extconf.rb branches/ruby_1_9_2/ext/digest/sha2/sha2.c branches/ruby_1_9_2/ext/digest/sha2/sha2init.c branches/ruby_1_9_2/ext/digest/sha2/sha2ossl.c Index: ruby_1_9_2/ChangeLog =================================================================== --- ruby_1_9_2/ChangeLog (revision 28340) +++ ruby_1_9_2/ChangeLog (revision 28341) @@ -1,3 +1,8 @@ +Wed Jun 16 18:35:20 2010 Akinori MUSHA <knu@i...> + + * ext/digest: Work around a build problem with VC++ 2010, likely + due to a bug of its cl.exe. [Bug #3231] + Wed Jun 16 15:44:59 2010 NAKAMURA Usaku <usa@r...> * error.c (rb_bug): existance of _set_abort_behavior() depends on Index: ruby_1_9_2/ext/digest/bubblebabble/bubblebabble.c =================================================================== --- ruby_1_9_2/ext/digest/bubblebabble/bubblebabble.c (revision 28340) +++ ruby_1_9_2/ext/digest/bubblebabble/bubblebabble.c (revision 28341) @@ -12,7 +12,7 @@ ************************************************/ #include "ruby.h" -#include "digest.h" +#include "../digest.h" static ID id_digest; Index: ruby_1_9_2/ext/digest/bubblebabble/extconf.rb =================================================================== --- ruby_1_9_2/ext/digest/bubblebabble/extconf.rb (revision 28340) +++ ruby_1_9_2/ext/digest/bubblebabble/extconf.rb (revision 28341) @@ -1,6 +1,5 @@ require 'mkmf' $defs << "-DHAVE_CONFIG_H" -$INCFLAGS << " -I$(srcdir)/.." create_makefile('digest/bubblebabble') Index: ruby_1_9_2/ext/digest/md5/extconf.rb =================================================================== --- ruby_1_9_2/ext/digest/md5/extconf.rb (revision 28340) +++ ruby_1_9_2/ext/digest/md5/extconf.rb (revision 28341) @@ -4,7 +4,6 @@ require "mkmf" $defs << "-DHAVE_CONFIG_H" -$INCFLAGS << " -I$(srcdir)/.." $objs = [ "md5init.#{$OBJEXT}" ] Index: ruby_1_9_2/ext/digest/md5/md5init.c =================================================================== --- ruby_1_9_2/ext/digest/md5/md5init.c (revision 28340) +++ ruby_1_9_2/ext/digest/md5/md5init.c (revision 28341) @@ -1,7 +1,7 @@ /* $RoughId: md5init.c,v 1.2 2001/07/13 19:49:10 knu Exp $ */ /* $Id$ */ -#include "digest.h" +#include "../digest.h" #if defined(HAVE_OPENSSL_MD5_H) #include "md5ossl.h" #else Index: ruby_1_9_2/ext/digest/md5/md5.h =================================================================== --- ruby_1_9_2/ext/digest/md5/md5.h (revision 28340) +++ ruby_1_9_2/ext/digest/md5/md5.h (revision 28341) @@ -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 Index: ruby_1_9_2/ext/digest/rmd160/rmd160.h =================================================================== --- ruby_1_9_2/ext/digest/rmd160/rmd160.h (revision 28340) +++ ruby_1_9_2/ext/digest/rmd160/rmd160.h (revision 28341) @@ -26,7 +26,7 @@ #ifndef _RMD160_H_ #define _RMD160_H_ -#include "defs.h" +#include "../defs.h" typedef struct { uint32_t state[5]; /* state (ABCDE) */ Index: ruby_1_9_2/ext/digest/rmd160/extconf.rb =================================================================== --- ruby_1_9_2/ext/digest/rmd160/extconf.rb (revision 28340) +++ ruby_1_9_2/ext/digest/rmd160/extconf.rb (revision 28341) @@ -4,7 +4,6 @@ require "mkmf" $defs << "-DNDEBUG" << "-DHAVE_CONFIG_H" -$INCFLAGS << " -I$(srcdir)/.." $objs = [ "rmd160init.#{$OBJEXT}" ] Index: ruby_1_9_2/ext/digest/rmd160/rmd160ossl.c =================================================================== --- ruby_1_9_2/ext/digest/rmd160/rmd160ossl.c (revision 28340) +++ ruby_1_9_2/ext/digest/rmd160/rmd160ossl.c (revision 28341) @@ -1,6 +1,6 @@ /* $Id$ */ -#include "defs.h" +#include "../defs.h" #include "rmd160ossl.h" void RMD160_Finish(RMD160_CTX *ctx, char *buf) { Index: ruby_1_9_2/ext/digest/rmd160/rmd160init.c =================================================================== --- ruby_1_9_2/ext/digest/rmd160/rmd160init.c (revision 28340) +++ ruby_1_9_2/ext/digest/rmd160/rmd160init.c (revision 28341) @@ -1,7 +1,7 @@ /* $RoughId: rmd160init.c,v 1.3 2001/07/13 20:00:43 knu Exp $ */ /* $Id$ */ -#include "digest.h" +#include "../digest.h" #if defined(HAVE_OPENSSL_RIPEMD_H) #include "rmd160ossl.h" #else Index: ruby_1_9_2/ext/digest/sha1/sha1init.c =================================================================== --- ruby_1_9_2/ext/digest/sha1/sha1init.c (revision 28340) +++ ruby_1_9_2/ext/digest/sha1/sha1init.c (revision 28341) @@ -1,7 +1,7 @@ /* $RoughId: sha1init.c,v 1.2 2001/07/13 19:49:10 knu Exp $ */ /* $Id$ */ -#include "digest.h" +#include "../digest.h" #if defined(HAVE_OPENSSL_SHA_H) #include "sha1ossl.h" #else Index: ruby_1_9_2/ext/digest/sha1/sha1.h =================================================================== --- ruby_1_9_2/ext/digest/sha1/sha1.h (revision 28340) +++ ruby_1_9_2/ext/digest/sha1/sha1.h (revision 28341) @@ -11,7 +11,7 @@ #ifndef _SYS_SHA1_H_ #define _SYS_SHA1_H_ -#include "defs.h" +#include "../defs.h" typedef struct { uint32_t state[5]; Index: ruby_1_9_2/ext/digest/sha1/extconf.rb =================================================================== --- ruby_1_9_2/ext/digest/sha1/extconf.rb (revision 28340) +++ ruby_1_9_2/ext/digest/sha1/extconf.rb (revision 28341) @@ -4,7 +4,6 @@ require "mkmf" $defs << "-DHAVE_CONFIG_H" -$INCFLAGS << " -I$(srcdir)/.." $objs = [ "sha1init.#{$OBJEXT}" ] Index: ruby_1_9_2/ext/digest/sha1/sha1ossl.c =================================================================== --- ruby_1_9_2/ext/digest/sha1/sha1ossl.c (revision 28340) +++ ruby_1_9_2/ext/digest/sha1/sha1ossl.c (revision 28341) @@ -1,6 +1,6 @@ /* $Id$ */ -#include "defs.h" +#include "../defs.h" #include "sha1ossl.h" void Index: ruby_1_9_2/ext/digest/sha2/sha2ossl.c =================================================================== --- ruby_1_9_2/ext/digest/sha2/sha2ossl.c (revision 28340) +++ ruby_1_9_2/ext/digest/sha2/sha2ossl.c (revision 28341) @@ -1,4 +1,4 @@ -#include "defs.h" +#include "../defs.h" #include "sha2ossl.h" #define SHA_Finish(bit) \ Index: ruby_1_9_2/ext/digest/sha2/sha2init.c =================================================================== --- ruby_1_9_2/ext/digest/sha2/sha2init.c (revision 28340) +++ ruby_1_9_2/ext/digest/sha2/sha2init.c (revision 28341) @@ -1,7 +1,7 @@ /* $RoughId: sha2init.c,v 1.3 2001/07/13 20:00:43 knu Exp $ */ /* $Id$ */ -#include "digest.h" +#include "../digest.h" #if defined(SHA2_USE_OPENSSL) #include "sha2ossl.h" #else Index: ruby_1_9_2/ext/digest/sha2/extconf.rb =================================================================== --- ruby_1_9_2/ext/digest/sha2/extconf.rb (revision 28340) +++ ruby_1_9_2/ext/digest/sha2/extconf.rb (revision 28341) @@ -4,7 +4,6 @@ require "mkmf" $defs << "-DHAVE_CONFIG_H" -$INCFLAGS << " -I$(srcdir)/.." $objs = [ "sha2init.#{$OBJEXT}" ] Index: ruby_1_9_2/ext/digest/sha2/sha2.c =================================================================== --- ruby_1_9_2/ext/digest/sha2/sha2.c (revision 28340) +++ ruby_1_9_2/ext/digest/sha2/sha2.c (revision 28341) @@ -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" -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/