diff options
| author | bcook <> | 2014-07-09 23:46:14 +0000 |
|---|---|---|
| committer | bcook <> | 2014-07-09 23:46:14 +0000 |
| commit | 7d5786d710e7dae80c5edd8896e3b4b10b7a8fd4 (patch) | |
| tree | 81e39fbdae5c340a4305fdde178b9c06636996fa | |
| parent | 00639bfe4c41e004696976f685b376893b255e1a (diff) | |
| download | openbsd-7d5786d710e7dae80c5edd8896e3b4b10b7a8fd4.tar.gz openbsd-7d5786d710e7dae80c5edd8896e3b4b10b7a8fd4.tar.bz2 openbsd-7d5786d710e7dae80c5edd8896e3b4b10b7a8fd4.zip | |
include <limits.h> for LONG_MIN/LONG_MAX.
Also remove <sys/filio.h> added from previous commit.
This was the wrong way to get FIONBIO.
ok jsing@
| -rw-r--r-- | src/lib/libcrypto/bio/b_sock.c | 4 | ||||
| -rw-r--r-- | src/lib/libssl/src/crypto/bio/b_sock.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libcrypto/bio/b_sock.c b/src/lib/libcrypto/bio/b_sock.c index cd57643b94..8e86383cc6 100644 --- a/src/lib/libcrypto/bio/b_sock.c +++ b/src/lib/libcrypto/bio/b_sock.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: b_sock.c,v 1.49 2014/07/09 15:19:52 bcook Exp $ */ | 1 | /* $OpenBSD: b_sock.c,v 1.50 2014/07/09 23:46:14 bcook Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -56,7 +56,6 @@ | |||
| 56 | * [including the GNU Public Licence.] | 56 | * [including the GNU Public Licence.] |
| 57 | */ | 57 | */ |
| 58 | 58 | ||
| 59 | #include <sys/filio.h> | ||
| 60 | #include <sys/ioctl.h> | 59 | #include <sys/ioctl.h> |
| 61 | #include <sys/socket.h> | 60 | #include <sys/socket.h> |
| 62 | 61 | ||
| @@ -65,6 +64,7 @@ | |||
| 65 | #include <netinet/tcp.h> | 64 | #include <netinet/tcp.h> |
| 66 | 65 | ||
| 67 | #include <errno.h> | 66 | #include <errno.h> |
| 67 | #include <limits.h> | ||
| 68 | #include <netdb.h> | 68 | #include <netdb.h> |
| 69 | #include <stdio.h> | 69 | #include <stdio.h> |
| 70 | #include <stdlib.h> | 70 | #include <stdlib.h> |
diff --git a/src/lib/libssl/src/crypto/bio/b_sock.c b/src/lib/libssl/src/crypto/bio/b_sock.c index cd57643b94..8e86383cc6 100644 --- a/src/lib/libssl/src/crypto/bio/b_sock.c +++ b/src/lib/libssl/src/crypto/bio/b_sock.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: b_sock.c,v 1.49 2014/07/09 15:19:52 bcook Exp $ */ | 1 | /* $OpenBSD: b_sock.c,v 1.50 2014/07/09 23:46:14 bcook Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -56,7 +56,6 @@ | |||
| 56 | * [including the GNU Public Licence.] | 56 | * [including the GNU Public Licence.] |
| 57 | */ | 57 | */ |
| 58 | 58 | ||
| 59 | #include <sys/filio.h> | ||
| 60 | #include <sys/ioctl.h> | 59 | #include <sys/ioctl.h> |
| 61 | #include <sys/socket.h> | 60 | #include <sys/socket.h> |
| 62 | 61 | ||
| @@ -65,6 +64,7 @@ | |||
| 65 | #include <netinet/tcp.h> | 64 | #include <netinet/tcp.h> |
| 66 | 65 | ||
| 67 | #include <errno.h> | 66 | #include <errno.h> |
| 67 | #include <limits.h> | ||
| 68 | #include <netdb.h> | 68 | #include <netdb.h> |
| 69 | #include <stdio.h> | 69 | #include <stdio.h> |
| 70 | #include <stdlib.h> | 70 | #include <stdlib.h> |
