diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-08-15 20:55:57 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-08-15 20:55:57 +0000 |
commit | 6d72ea84a9bd86485d24a7de22bbda68f714b611 (patch) | |
tree | 70eb4e1f90412ab8767fc861f0ad197bb7d0f0c2 | |
parent | 3b76c076bc71004e4711565f6960fad42de6550e (diff) | |
parent | 2f1eb739412a85579ff4de5567474e7c8fe1b7c3 (diff) |
sorry. I made wrong tags.v1_8_5_72
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/tags/v1_8_5_72@12992 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 21 | ||||
-rw-r--r-- | ext/openssl/ossl.h | 1 | ||||
-rw-r--r-- | ext/openssl/ossl_pkcs5.h | 6 | ||||
-rw-r--r-- | ext/openssl/ossl_x509name.c | 4 | ||||
-rw-r--r-- | ext/sdbm/_sdbm.c | 2 | ||||
-rw-r--r-- | ext/syck/syck.h | 2 | ||||
-rw-r--r-- | version.h | 2 | ||||
-rw-r--r-- | win32/win32.c | 1 | ||||
-rw-r--r-- | win32/win32.h | 1 |
9 files changed, 4 insertions, 36 deletions
@@ -1,24 +1,3 @@ -Thu Aug 16 05:12:05 2007 pegacorn <subscriber.jp AT gmail.com> - - * ext/openssl/ossl.h: include ossl_pkcs5.h. [ruby-dev:31231] - - * ext/openssl/ossl_pkcs5.h: new file for PKCS5. [ruby-dev:31231] - - * ext/openssl/ossl_x509name.c (ossl_x509name_to_s): use ossl_raise() - instead of rb_raise(). [ruby-dev:31222] - - * ext/sdbm/_sdbm.c: DOSISH platforms need io.h. [ruby-dev:31232] - - * ext/syck/syck.h: include stdlib.h for malloc() and free(). - [ruby-dev:31232] - - * ext/syck/syck.h (syck_parser_set_input_type): prototype added. - [ruby-dev:31231] - - * win32/win32.c: include mbstring.h for _mbspbrk(). [ruby-dev:31232] - - * win32.h (rb_w32_getcwd): prototype added. [ruby-dev:31232] - Thu Aug 16 05:02:39 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> * bignum.c (rb_cstr_to_inum): check leading non-digits. diff --git a/ext/openssl/ossl.h b/ext/openssl/ossl.h index 336b468eb2..eaa1fe6eb2 100644 --- a/ext/openssl/ossl.h +++ b/ext/openssl/ossl.h @@ -208,7 +208,6 @@ void ossl_debug(const char *, ...); #include "ossl_ocsp.h" #include "ossl_pkcs12.h" #include "ossl_pkcs7.h" -#include "ossl_pkcs5.h" #include "ossl_pkey.h" #include "ossl_rand.h" #include "ossl_ssl.h" diff --git a/ext/openssl/ossl_pkcs5.h b/ext/openssl/ossl_pkcs5.h deleted file mode 100644 index a3b132bc50..0000000000 --- a/ext/openssl/ossl_pkcs5.h +++ /dev/null @@ -1,6 +0,0 @@ -#if !defined(_OSSL_PKCS5_H_) -#define _OSSL_PKCS5_H_ - -void Init_ossl_pkcs5(void); - -#endif /* _OSSL_PKCS5_H_ */ diff --git a/ext/openssl/ossl_x509name.c b/ext/openssl/ossl_x509name.c index 1a456f2c48..5c7e6e89a2 100644 --- a/ext/openssl/ossl_x509name.c +++ b/ext/openssl/ossl_x509name.c @@ -188,11 +188,11 @@ ossl_x509name_to_s(int argc, VALUE *argv, VALUE self) return ossl_x509name_to_s_old(self); else iflag = NUM2ULONG(flag); if (!(out = BIO_new(BIO_s_mem()))) - ossl_raise(eX509NameError, NULL); + rb_raise(eX509NameError, NULL); GetX509Name(self, name); if (!X509_NAME_print_ex(out, name, 0, iflag)){ BIO_free(out); - ossl_raise(eX509NameError, NULL); + rb_raise(eX509NameError, NULL); } str = ossl_membio2str(out); diff --git a/ext/sdbm/_sdbm.c b/ext/sdbm/_sdbm.c index 7ffcf8579c..11353e2345 100644 --- a/ext/sdbm/_sdbm.c +++ b/ext/sdbm/_sdbm.c @@ -71,7 +71,7 @@ static int duppair proto((char *, datum)); #include <stdio.h> #include <stdlib.h> -#ifdef DOSISH +#ifdef MSDOS #include <io.h> #endif #include <sys/types.h> diff --git a/ext/syck/syck.h b/ext/syck/syck.h index bc383ff2de..51a0f0aa9c 100644 --- a/ext/syck/syck.h +++ b/ext/syck/syck.h @@ -17,7 +17,6 @@ #define YAML_DOMAIN "yaml.org,2002" #include <stdio.h> -#include <stdlib.h> #include <ctype.h> #include "st.h" @@ -400,7 +399,6 @@ int syck_scan_scalar( int, char *, long ); void syck_parser_handler( SyckParser *, SyckNodeHandler ); void syck_parser_error_handler( SyckParser *, SyckErrorHandler ); void syck_parser_bad_anchor_handler( SyckParser *, SyckBadAnchorHandler ); -void syck_parser_set_input_type( SyckParser *, enum syck_parser_input ); void syck_parser_file( SyckParser *, FILE *, SyckIoFileRead ); void syck_parser_str( SyckParser *, char *, long, SyckIoStrRead ); void syck_parser_str_auto( SyckParser *, char *, SyckIoStrRead ); @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2007-08-16" #define RUBY_VERSION_CODE 185 #define RUBY_RELEASE_CODE 20070816 -#define RUBY_PATCHLEVEL 73 +#define RUBY_PATCHLEVEL 72 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 diff --git a/win32/win32.c b/win32/win32.c index 784d9eccfe..cdb5b61bc9 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -27,7 +27,6 @@ #include <wincon.h> #ifdef __MINGW32__ #include <mswsock.h> -#include <mbstring.h> #endif #include "win32.h" #include "win32/dir.h" diff --git a/win32/win32.h b/win32/win32.h index e11f69afd0..48646da7a3 100644 --- a/win32/win32.h +++ b/win32/win32.h @@ -193,7 +193,6 @@ extern struct protoent * rb_w32_getprotobyname(char *); extern struct protoent * rb_w32_getprotobynumber(int); extern struct servent * rb_w32_getservbyname(char *, char *); extern struct servent * rb_w32_getservbyport(int, char *); -extern char * rb_w32_getcwd(char *, int); extern char * rb_w32_getenv(const char *); extern int rb_w32_rename(const char *, const char *); extern int rb_w32_stat(const char *, struct stat *); |