kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ext/digest/*/*.[ch]: include ruby.h before digest.h to avoid

Browse source 
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
This commit is contained in:
naruse 2015-11-21 04:35:57 +00:00
parent c964c738be
commit 9a7c25abab
15 changed files with 26 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -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.

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

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

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

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

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

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

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

@ -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

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 $ */
/* $Id$ */
#include "digest.h"
#include <ruby/ruby.h>
#include "../digest.h"
#if defined(MD5_USE_OPENSSL)
#include "md5ossl.h"
#elif defined(MD5_USE_COMMONDIGEST)

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

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

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

@ -26,7 +26,7 @@
#ifndef _RMD160_H_
#define _RMD160_H_
#include "defs.h"
#include "../defs.h"
typedef struct {
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 $ */
/* $Id$ */
#include "digest.h"
#include <ruby/ruby.h>
#include "../digest.h"
#if defined(RMD160_USE_OPENSSL)
#include "rmd160ossl.h"
#else

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

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

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

@ -11,7 +11,7 @@
#ifndef _SYS_SHA1_H_
#define _SYS_SHA1_H_
#include "defs.h"
#include "../defs.h"
typedef struct {
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 $ */
/* $Id$ */
#include "digest.h"
#include <ruby/ruby.h>
#include "../digest.h"
#if defined(SHA1_USE_OPENSSL)
#include "sha1ossl.h"
#elif defined(SHA1_USE_COMMONDIGEST)

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

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

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

@ -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"

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 $ */
/* $Id$ */
#include "digest.h"
#include <ruby/ruby.h>
#include "../digest.h"
#if defined(SHA2_USE_OPENSSL)
#include "sha2ossl.h"
#elif defined(SHA2_USE_COMMONDIGEST)