diff options
| author | jkim <jkim@FreeBSD.org> | 2012-07-12 19:30:53 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2012-07-12 19:30:53 +0000 |
| commit | e393e47b1e23744a7d0ed999afb5d137070f5f8f (patch) | |
| tree | 9739a803477c4610ec6628d914bdcc55fbb3602a /crypto/openssl/apps/s_apps.h | |
| parent | a8b00dea2cde4c3d96e6ed1de530ddff21012266 (diff) | |
| parent | 532b4084cb8cac5e6d91d42aa6a497dd4ba4a4f5 (diff) | |
| download | FreeBSD-src-e393e47b1e23744a7d0ed999afb5d137070f5f8f.zip FreeBSD-src-e393e47b1e23744a7d0ed999afb5d137070f5f8f.tar.gz | |
Merge OpenSSL 1.0.1c.
Approved by: benl (maintainer)
Diffstat (limited to 'crypto/openssl/apps/s_apps.h')
| -rw-r--r-- | crypto/openssl/apps/s_apps.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/openssl/apps/s_apps.h b/crypto/openssl/apps/s_apps.h index f5a39ba..820e5c5 100644 --- a/crypto/openssl/apps/s_apps.h +++ b/crypto/openssl/apps/s_apps.h @@ -117,7 +117,7 @@ #include <conio.h> #endif -#ifdef OPENSSL_SYS_MSDOS +#if defined(OPENSSL_SYS_MSDOS) && !defined(_WIN32) #define _kbhit kbhit #endif @@ -162,7 +162,7 @@ int extract_port(char *str, short *port_ptr); int extract_host_port(char *str,char **host_ptr,unsigned char *ip,short *p); long MS_CALLBACK bio_dump_callback(BIO *bio, int cmd, const char *argp, - int argi, long argl, long ret); + int argi, long argl, long ret); #ifdef HEADER_SSL_H void MS_CALLBACK apps_ssl_info_callback(const SSL *s, int where, int ret); |
