X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=crypto%2Fbio%2Fbio_cb.c;h=0ffa4d21367f58a7374842ebca64d60f871b64be;hb=f8000b93459cff7468c0a86dec913d06c0f0b6d6;hp=bc6ed9eda1d0fbf13d139c5054a7dc94d6f688a6;hpb=58964a492275ca9a59a0cd9c8155cb2491b4b909;p=oweals%2Fopenssl.git diff --git a/crypto/bio/bio_cb.c b/crypto/bio/bio_cb.c index bc6ed9eda1..0ffa4d2136 100644 --- a/crypto/bio/bio_cb.c +++ b/crypto/bio/bio_cb.c @@ -60,16 +60,11 @@ #include #include #include "cryptlib.h" -#include "bio.h" -#include "err.h" +#include +#include -long MS_CALLBACK BIO_debug_callback(bio,cmd,argp,argi,argl,ret) -BIO *bio; -int cmd; -char *argp; -int argi; -long argl; -long ret; +long MS_CALLBACK BIO_debug_callback(BIO *bio, int cmd, const char *argp, + int argi, long argl, long ret) { BIO *b; MS_STATIC char buf[256]; @@ -130,7 +125,7 @@ long ret; b=(BIO *)bio->cb_arg; if (b != NULL) BIO_write(b,buf,strlen(buf)); -#if !defined(NO_STDIO) && !defined(WIN16) +#if !defined(OPENSSL_NO_STDIO) && !defined(OPENSSL_SYS_WIN16) else fputs(buf,stderr); #endif