diff options
Diffstat (limited to 'ext')
-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 |
5 files changed, 12 insertions, 3 deletions
diff --git a/ext/openssl/ossl.h b/ext/openssl/ossl.h index eaa1fe6eb2..336b468eb2 100644 --- a/ext/openssl/ossl.h +++ b/ext/openssl/ossl.h @@ -208,6 +208,7 @@ 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 new file mode 100644 index 0000000000..a3b132bc50 --- /dev/null +++ b/ext/openssl/ossl_pkcs5.h @@ -0,0 +1,6 @@ +#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 5c7e6e89a2..1a456f2c48 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()))) - rb_raise(eX509NameError, NULL); + ossl_raise(eX509NameError, NULL); GetX509Name(self, name); if (!X509_NAME_print_ex(out, name, 0, iflag)){ BIO_free(out); - rb_raise(eX509NameError, NULL); + ossl_raise(eX509NameError, NULL); } str = ossl_membio2str(out); diff --git a/ext/sdbm/_sdbm.c b/ext/sdbm/_sdbm.c index 11353e2345..7ffcf8579c 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 MSDOS +#ifdef DOSISH #include <io.h> #endif #include <sys/types.h> diff --git a/ext/syck/syck.h b/ext/syck/syck.h index 51a0f0aa9c..bc383ff2de 100644 --- a/ext/syck/syck.h +++ b/ext/syck/syck.h @@ -17,6 +17,7 @@ #define YAML_DOMAIN "yaml.org,2002" #include <stdio.h> +#include <stdlib.h> #include <ctype.h> #include "st.h" @@ -399,6 +400,7 @@ 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 ); |