From: Richard Levitte <levitte@openssl.org>
Date: Tue, 2 Feb 2016 15:23:26 +0000 (+0100)
Subject: Refactoring BIO: Small adjustments
X-Git-Tag: OpenSSL_1_1_0-pre3~312
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a5cc75d6615227e5307a1f9f17f762a7e2d8d3fb;p=oweals%2Fopenssl.git

Refactoring BIO: Small adjustments

Because of the way bio_lcl.h is organised, we must not include
internal/cryptlib.h before it.  As a matter of fact, bio_lcl.h
includes internal/cryptlib.h on its own.

Reviewed-by: Kurt Roeckx <kurt@openssl.org>
---

diff --git a/crypto/bio/b_dump.c b/crypto/bio/b_dump.c
index 77d8c3d96e..c586b765ee 100644
--- a/crypto/bio/b_dump.c
+++ b/crypto/bio/b_dump.c
@@ -60,7 +60,6 @@
  */
 
 #include <stdio.h>
-#include "internal/cryptlib.h"
 #include "bio_lcl.h"
 
 #define TRUNCATE
diff --git a/crypto/bio/bss_fd.c b/crypto/bio/bss_fd.c
index 12306c2dc0..d00c5ce3b4 100644
--- a/crypto/bio/bss_fd.c
+++ b/crypto/bio/bss_fd.c
@@ -57,8 +57,8 @@
 
 #include <stdio.h>
 #include <errno.h>
-#define USE_SOCKETS
-#include "internal/cryptlib.h"
+
+#include "bio_lcl.h"
 
 #if defined(OPENSSL_NO_POSIX_IO)
 /*
@@ -96,8 +96,6 @@ BIO_METHOD *BIO_s_fd(void)
  * file descriptors can only be provided by application. Therefore
  * "UPLINK" calls are due...
  */
-# include "bio_lcl.h"
-
 static int fd_write(BIO *h, const char *buf, int num);
 static int fd_read(BIO *h, char *buf, int size);
 static int fd_puts(BIO *h, const char *str);
diff --git a/crypto/bio/bss_file.c b/crypto/bio/bss_file.c
index 1e3f46345f..334eca038d 100644
--- a/crypto/bio/bss_file.c
+++ b/crypto/bio/bss_file.c
@@ -84,7 +84,6 @@
 
 # include <stdio.h>
 # include <errno.h>
-# include "internal/cryptlib.h"
 # include "bio_lcl.h"
 # include <openssl/err.h>