diff options
| author | deraadt <> | 2014-04-17 20:58:08 +0000 |
|---|---|---|
| committer | deraadt <> | 2014-04-17 20:58:08 +0000 |
| commit | dea2616f54bc531ab8af0d74ac00fd23f61ba61d (patch) | |
| tree | a5c70a75ed1efb1996231f6e5bcd7edfd923d47c /src/lib/libcrypto/bio/b_sock.c | |
| parent | 6800e69ce3db198d08e1e509efdb706f4d2b4cf0 (diff) | |
| download | openbsd-dea2616f54bc531ab8af0d74ac00fd23f61ba61d.tar.gz openbsd-dea2616f54bc531ab8af0d74ac00fd23f61ba61d.tar.bz2 openbsd-dea2616f54bc531ab8af0d74ac00fd23f61ba61d.zip | |
Mostly gut e_os.h:
USE_SOCKETS is unrelated to using sockets, but just pulls in .h files. It
makes every file buy a kitchen sink, because 11 files forgot to.
EXIT() is really exit(), a gentle surprise
but... OPENSSL_EXIT() is really just return(), because noone compiles the
openssl command non-monolithic anymore
Diffstat (limited to 'src/lib/libcrypto/bio/b_sock.c')
| -rw-r--r-- | src/lib/libcrypto/bio/b_sock.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/lib/libcrypto/bio/b_sock.c b/src/lib/libcrypto/bio/b_sock.c index 1ae9d96577..0972feeb58 100644 --- a/src/lib/libcrypto/bio/b_sock.c +++ b/src/lib/libcrypto/bio/b_sock.c | |||
| @@ -59,16 +59,13 @@ | |||
| 59 | #include <stdio.h> | 59 | #include <stdio.h> |
| 60 | #include <stdlib.h> | 60 | #include <stdlib.h> |
| 61 | #include <errno.h> | 61 | #include <errno.h> |
| 62 | #define USE_SOCKETS | ||
| 63 | #include "cryptlib.h" | 62 | #include "cryptlib.h" |
| 64 | #include <openssl/bio.h> | 63 | #include <openssl/bio.h> |
| 65 | #if defined(OPENSSL_SYS_NETWARE) && defined(NETWARE_BSDSOCK) | ||
| 66 | #include <netdb.h> | ||
| 67 | #if defined(NETWARE_CLIB) | ||
| 68 | #include <sys/ioctl.h> | 64 | #include <sys/ioctl.h> |
| 69 | NETDB_DEFINE_CONTEXT | 65 | |
| 70 | #endif | 66 | #include <netdb.h> |
| 71 | #endif | 67 | #include <sys/socket.h> |
| 68 | #include <netinet/in.h> | ||
| 72 | 69 | ||
| 73 | #ifndef OPENSSL_NO_SOCK | 70 | #ifndef OPENSSL_NO_SOCK |
| 74 | 71 | ||