diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-30 08:46:36 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-30 08:46:36 +0200 |
| commit | 73d82f7ac0d1add2697128c2e26c2432ffe172a5 (patch) | |
| tree | c6436b57a2191c57320396c37449109ebad745ec /openssl/apps/enc.c | |
| parent | 4a9e1f51655e03da1507dabce7c4c3960e7ca607 (diff) | |
| parent | 60adbfdea1ee754341d64454274e7aa83bae8971 (diff) | |
| download | vcxsrv-73d82f7ac0d1add2697128c2e26c2432ffe172a5.tar.gz vcxsrv-73d82f7ac0d1add2697128c2e26c2432ffe172a5.tar.bz2 vcxsrv-73d82f7ac0d1add2697128c2e26c2432ffe172a5.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
openssl/Makefile
Diffstat (limited to 'openssl/apps/enc.c')
| -rw-r--r-- | openssl/apps/enc.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/openssl/apps/enc.c b/openssl/apps/enc.c index c28d8b194..076225c4c 100644 --- a/openssl/apps/enc.c +++ b/openssl/apps/enc.c @@ -393,8 +393,10 @@ bad: if (inf == NULL) { +#ifndef OPENSSL_NO_SETVBUF_IONBF if (bufsize != NULL) setvbuf(stdin, (char *)NULL, _IONBF, 0); +#endif /* ndef OPENSSL_NO_SETVBUF_IONBF */ BIO_set_fp(in,stdin,BIO_NOCLOSE); } else @@ -447,8 +449,10 @@ bad: if (outf == NULL) { BIO_set_fp(out,stdout,BIO_NOCLOSE); +#ifndef OPENSSL_NO_SETVBUF_IONBF if (bufsize != NULL) setvbuf(stdout, (char *)NULL, _IONBF, 0); +#endif /* ndef OPENSSL_NO_SETVBUF_IONBF */ #ifdef OPENSSL_SYS_VMS { BIO *tmpbio = BIO_new(BIO_f_linebuffer()); |