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 77d8c3d96e316fd9b4ceef5984c8801e3b26f004..c586b765ee79918f824361256ca2d32874b198d8 100644 (file)
--- a/crypto/bio/b_dump.c
+++ b/crypto/bio/b_dump.c
@@ -60,7 +60,6 @@
  */
 
 #include <stdio.h>
  */
 
 #include <stdio.h>

-#include "internal/cryptlib.h"

 #include "bio_lcl.h"
 
 #define TRUNCATE
 #include "bio_lcl.h"
 
 #define TRUNCATE

diff --git a/crypto/bio/bss_fd.c b/crypto/bio/bss_fd.c
index 12306c2dc041c139d369d0a0343d9d2adc4fdf11..d00c5ce3b457fbbf856b27a33f9d60a62f2857e2 100644 (file)
--- a/crypto/bio/bss_fd.c
+++ b/crypto/bio/bss_fd.c
@@ -57,8 +57,8 @@
 
 #include <stdio.h>
 #include <errno.h>
 
 #include <stdio.h>
 #include <errno.h>

-#define USE_SOCKETS
-#include "internal/cryptlib.h"
+
+#include "bio_lcl.h"

 
 #if defined(OPENSSL_NO_POSIX_IO)
 /*
 
 #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...
  */
  * 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);
 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 1e3f46345f8c49e03c566673df5260eddfb81909..334eca038d9e15ef6120e604917f14bd1ff21830 100644 (file)
--- a/crypto/bio/bss_file.c
+++ b/crypto/bio/bss_file.c
@@ -84,7 +84,6 @@
 
 # include <stdio.h>
 # include <errno.h>
 
 # include <stdio.h>
 # include <errno.h>

-# include "internal/cryptlib.h"

 # include "bio_lcl.h"
 # include <openssl/err.h>
 
 # include "bio_lcl.h"
 # include <openssl/err.h>