diff options
| author | Richard Levitte <levitte@openssl.org> | 2005-05-30 22:37:41 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2005-05-30 22:37:41 +0000 |
| commit | 77b97ee0d764dd09252aaaa02ff68992ca18a74d (patch) | |
| tree | 3f82cf77e0e8381d15582ff3ca0133114e5cd960 | |
| parent | e2ac4732cd4f0efc3dff3261d19aed0ced2c4dde (diff) | |
DJGPP changes. Contributed by Doug Kaufman <dkaufman@rahul.net>
| -rw-r--r-- | apps/s_client.c | 3 | ||||
| -rw-r--r-- | apps/s_server.c | 6 | ||||
| -rw-r--r-- | crypto/rand/rand_unix.c | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/apps/s_client.c b/apps/s_client.c index eaa9269610..b22f3196e6 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -263,6 +263,9 @@ int MAIN(int argc, char **argv) int starttls_proto = 0; int prexit = 0, vflags = 0; SSL_METHOD *meth=NULL; +#ifdef sock_type +#undef sock_type +#endif int sock_type=SOCK_STREAM; BIO *sbio; char *inrand=NULL; diff --git a/apps/s_server.c b/apps/s_server.c index 59b6305e97..afc27e15c9 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -262,6 +262,9 @@ static char *engine_id=NULL; static const char *session_id_prefix=NULL; static int enable_timeouts = 0; +#ifdef mtu +#undef mtu +#endif static long mtu; static int cert_chain = 0; @@ -534,6 +537,9 @@ int MAIN(int argc, char *argv[]) int no_tmp_rsa=0,no_dhe=0,no_ecdhe=0,nocert=0; int state=0; SSL_METHOD *meth=NULL; +#ifdef sock_type +#undef sock_type +#endif int sock_type=SOCK_STREAM; #ifndef OPENSSL_NO_ENGINE ENGINE *e=NULL; diff --git a/crypto/rand/rand_unix.c b/crypto/rand/rand_unix.c index 14837a7a7d..bf9a0e993a 100644 --- a/crypto/rand/rand_unix.c +++ b/crypto/rand/rand_unix.c @@ -153,7 +153,7 @@ int RAND_poll(void) int n = 0; #endif #ifdef DEVRANDOM - static const char *randomfiles[] = { DEVRANDOM }; + static const char *randomfiles[] = { "DEVRANDOM" }; struct stat randomstats[sizeof(randomfiles)/sizeof(randomfiles[0])]; int fd,i; #endif |