archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-17 17:43:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

merge revision(s) 52694: [Backport #3231]

Browse source 
* 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
This commit is contained in:
nagachika 2015-11-24 15:28:43 +00:00
parent ae2b1d2fe1
commit 2c30e876c4
17 changed files with 28 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
Wed Nov 25 00:14:28 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.
Wed Nov 25 00:03:42 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org> Wed Nov 25 00:03:42 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org>
* Added missing reference of GitHub * Added missing reference of GitHub

4
ext/digest/bubblebabble/bubblebabble.c
View file

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

1
ext/digest/bubblebabble/extconf.rb
View file

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

1
ext/digest/md5/extconf.rb
View file

@ -5,7 +5,6 @@
require "mkmf" require "mkmf"
$defs << "-DHAVE_CONFIG_H" $defs << "-DHAVE_CONFIG_H"
$INCFLAGS << " -I$(srcdir)/.."
$objs = [ "md5init.#{$OBJEXT}" ] $objs = [ "md5init.#{$OBJEXT}" ]

2
ext/digest/md5/md5.h
View file

@ -46,7 +46,7 @@
#ifndef MD5_INCLUDED #ifndef MD5_INCLUDED
# define MD5_INCLUDED # define MD5_INCLUDED
#include "defs.h" #include "../defs.h"
/* /*
* This code has some adaptations for the Ghostscript environment, but it * This code has some adaptations for the Ghostscript environment, but it

3
ext/digest/md5/md5init.c
View file

@ -1,7 +1,8 @@
/* $RoughId: md5init.c,v 1.2 2001/07/13 19:49:10 knu Exp $ */ /* $RoughId: md5init.c,v 1.2 2001/07/13 19:49:10 knu Exp $ */
/* $Id$ */ /* $Id$ */
#include "digest.h" #include <ruby/ruby.h>
#include "../digest.h"
#if defined(HAVE_OPENSSL_MD5_H) #if defined(HAVE_OPENSSL_MD5_H)
#include "md5ossl.h" #include "md5ossl.h"
#else #else

1
ext/digest/rmd160/extconf.rb
View file

@ -5,7 +5,6 @@
require "mkmf" require "mkmf"
$defs << "-DNDEBUG" << "-DHAVE_CONFIG_H" $defs << "-DNDEBUG" << "-DHAVE_CONFIG_H"
$INCFLAGS << " -I$(srcdir)/.."
$objs = [ "rmd160init.#{$OBJEXT}" ] $objs = [ "rmd160init.#{$OBJEXT}" ]

2
ext/digest/rmd160/rmd160.h
View file

@ -26,7 +26,7 @@
#ifndef _RMD160_H_ #ifndef _RMD160_H_
#define _RMD160_H_ #define _RMD160_H_
#include "defs.h" #include "../defs.h"
typedef struct { typedef struct {
uint32_t state[5]; /* state (ABCDE) */ uint32_t state[5]; /* state (ABCDE) */

3
ext/digest/rmd160/rmd160init.c
View file

@ -1,7 +1,8 @@
/* $RoughId: rmd160init.c,v 1.3 2001/07/13 20:00:43 knu Exp $ */ /* $RoughId: rmd160init.c,v 1.3 2001/07/13 20:00:43 knu Exp $ */
/* $Id$ */ /* $Id$ */
#include "digest.h" #include <ruby/ruby.h>
#include "../digest.h"
#if defined(HAVE_OPENSSL_RIPEMD_H) #if defined(HAVE_OPENSSL_RIPEMD_H)
#include "rmd160ossl.h" #include "rmd160ossl.h"
#else #else

1
ext/digest/sha1/extconf.rb
View file

@ -5,7 +5,6 @@
require "mkmf" require "mkmf"
$defs << "-DHAVE_CONFIG_H" $defs << "-DHAVE_CONFIG_H"
$INCFLAGS << " -I$(srcdir)/.."
$objs = [ "sha1init.#{$OBJEXT}" ] $objs = [ "sha1init.#{$OBJEXT}" ]

2
ext/digest/sha1/sha1.h
View file

@ -11,7 +11,7 @@
#ifndef _SYS_SHA1_H_ #ifndef _SYS_SHA1_H_
#define _SYS_SHA1_H_ #define _SYS_SHA1_H_
#include "defs.h" #include "../defs.h"
typedef struct { typedef struct {
uint32_t state[5]; uint32_t state[5];

3
ext/digest/sha1/sha1init.c
View file

@ -1,7 +1,8 @@
/* $RoughId: sha1init.c,v 1.2 2001/07/13 19:49:10 knu Exp $ */ /* $RoughId: sha1init.c,v 1.2 2001/07/13 19:49:10 knu Exp $ */
/* $Id$ */ /* $Id$ */
#include "digest.h" #include <ruby/ruby.h>
#include "../digest.h"
#if defined(HAVE_OPENSSL_SHA_H) #if defined(HAVE_OPENSSL_SHA_H)
#include "sha1ossl.h" #include "sha1ossl.h"
#else #else

3
ext/digest/sha2/extconf.rb
View file

@ -5,7 +5,6 @@
require "mkmf" require "mkmf"
$defs << "-DHAVE_CONFIG_H" $defs << "-DHAVE_CONFIG_H"
$INCFLAGS << " -I$(srcdir)/.."
$objs = [ "sha2init.#{$OBJEXT}" ] $objs = [ "sha2init.#{$OBJEXT}" ]
@ -27,6 +26,4 @@ have_header("sys/cdefs.h")
$preload = %w[digest] $preload = %w[digest]
if have_type("uint64_t", "defs.h", $defs.join(' '))
create_makefile("digest/sha2") create_makefile("digest/sha2")
end

2
ext/digest/sha2/sha2.c
View file

@ -34,7 +34,7 @@
* $Id$ * $Id$
*/ */
#include "defs.h" #include "../defs.h"
#include <string.h> /* memcpy()/memset() or bcopy()/bzero() */ #include <string.h> /* memcpy()/memset() or bcopy()/bzero() */
#include <assert.h> /* assert() */ #include <assert.h> /* assert() */
#include "sha2.h" #include "sha2.h"

3
ext/digest/sha2/sha2init.c
View file

@ -1,7 +1,8 @@
/* $RoughId: sha2init.c,v 1.3 2001/07/13 20:00:43 knu Exp $ */ /* $RoughId: sha2init.c,v 1.3 2001/07/13 20:00:43 knu Exp $ */
/* $Id$ */ /* $Id$ */
#include "digest.h" #include <ruby/ruby.h>
#include "../digest.h"
#if defined(SHA2_USE_OPENSSL) #if defined(SHA2_USE_OPENSSL)
#include "sha2ossl.h" #include "sha2ossl.h"
#else #else

2
ext/digest/sha2/sha2ossl.c
View file

@ -1,4 +1,4 @@
#include "defs.h" #include "../defs.h"
#include "sha2ossl.h" #include "sha2ossl.h"
#define SHA_Finish(bit) \ #define SHA_Finish(bit) \

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.2.4" #define RUBY_VERSION "2.2.4"
#define RUBY_RELEASE_DATE "2015-11-25" #define RUBY_RELEASE_DATE "2015-11-25"
#define RUBY_PATCHLEVEL 195 #define RUBY_PATCHLEVEL 196
#define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_YEAR 2015
#define RUBY_RELEASE_MONTH 11 #define RUBY_RELEASE_MONTH 11