resolve conflicts

2 files changed, 2 insertions, 2 deletions

diff --git a/src/lib/libcrypto/bio/bss_bio.c b/src/lib/libcrypto/bio/bss_bio.c
index 0f9f0955b4..76bd48e767 100644
--- a/src/lib/libcrypto/bio/bss_bio.c
+++ b/src/lib/libcrypto/bio/bss_bio.c
@@ -919,6 +919,6 @@ int BIO_nwrite(BIO *bio, char **buf, int num)
 
         ret = BIO_ctrl(bio, BIO_C_NWRITE, num, buf);
         if (ret > 0)
-                bio->num_read += ret;
+                bio->num_write += ret;
         return ret;
         }
diff --git a/src/lib/libcrypto/bio/bss_file.c b/src/lib/libcrypto/bio/bss_file.c
index 0c8c8115fa..e692a08e58 100644
--- a/src/lib/libcrypto/bio/bss_file.c
+++ b/src/lib/libcrypto/bio/bss_file.c
@@ -279,7 +279,7 @@ static long MS_CALLBACK file_ctrl(BIO *b, int cmd, long num, void *ptr)
 #endif
                 {
 #if defined(OPENSSL_SYS_WINDOWS)
-                int fd = fileno((FILE*)ptr);
+                int fd = _fileno((FILE*)ptr);
                 if (num & BIO_FP_TEXT)
                         _setmode(fd,_O_TEXT);
                 else