diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-02-02 16:23:26 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-02-03 19:37:07 +0100 |
| commit | a5cc75d6615227e5307a1f9f17f762a7e2d8d3fb (patch) | |
| tree | 7c4caf8d135b7f85259412dd91b9990c126e4934 /crypto/bio | |
| parent | 28a0841bf58e3813b2e07ad22f19484308e2f70a (diff) | |
| download | openssl-a5cc75d6615227e5307a1f9f17f762a7e2d8d3fb.zip openssl-a5cc75d6615227e5307a1f9f17f762a7e2d8d3fb.tar.gz openssl-a5cc75d6615227e5307a1f9f17f762a7e2d8d3fb.tar.bz2 | |
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>
Diffstat (limited to 'crypto/bio')
| -rw-r--r-- | crypto/bio/b_dump.c | 1 | ||||
| -rw-r--r-- | crypto/bio/bss_fd.c | 6 | ||||
| -rw-r--r-- | crypto/bio/bss_file.c | 1 |
3 files changed, 2 insertions, 6 deletions
diff --git a/crypto/bio/b_dump.c b/crypto/bio/b_dump.c index 77d8c3d..c586b76 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 12306c2..d00c5ce 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 1e3f463..334eca0 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> |