summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2003-03-20 23:18:32 +0000
committerRichard Levitte <levitte@openssl.org>2003-03-20 23:18:32 +0000
commit9ba4cc007b3af0b5e893716f8fe44943a5e3b234 (patch)
treea04286657bbc8cf19ada1e8242722b5fe18af0ce /crypto
parent7b5a6c7a6278eb255ab0f28a72a702bef456f526 (diff)
Make sure we get the definition of OPENSSL_NO_SOCK.
Diffstat (limited to 'crypto')
-rw-r--r--crypto/bio/b_sock.c4
-rw-r--r--crypto/bio/bss_acpt.c4
-rw-r--r--crypto/bio/bss_conn.c4
-rw-r--r--crypto/bio/bss_sock.c5
4 files changed, 7 insertions, 10 deletions
diff --git a/crypto/bio/b_sock.c b/crypto/bio/b_sock.c
index 601a14f37c..c501008028 100644
--- a/crypto/bio/b_sock.c
+++ b/crypto/bio/b_sock.c
@@ -56,8 +56,6 @@
* [including the GNU Public Licence.]
*/
-#ifndef OPENSSL_NO_SOCK
-
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
@@ -65,6 +63,8 @@
#include "cryptlib.h"
#include <openssl/bio.h>
+#ifndef OPENSSL_NO_SOCK
+
#ifdef OPENSSL_SYS_WIN16
#define SOCKET_PROTOCOL 0 /* more microsoft stupidity */
#else
diff --git a/crypto/bio/bss_acpt.c b/crypto/bio/bss_acpt.c
index 8ea1db158b..d090b7272f 100644
--- a/crypto/bio/bss_acpt.c
+++ b/crypto/bio/bss_acpt.c
@@ -56,14 +56,14 @@
* [including the GNU Public Licence.]
*/
-#ifndef OPENSSL_NO_SOCK
-
#include <stdio.h>
#include <errno.h>
#define USE_SOCKETS
#include "cryptlib.h"
#include <openssl/bio.h>
+#ifndef OPENSSL_NO_SOCK
+
#ifdef OPENSSL_SYS_WIN16
#define SOCKET_PROTOCOL 0 /* more microsoft stupidity */
#else
diff --git a/crypto/bio/bss_conn.c b/crypto/bio/bss_conn.c
index 743db6ff94..33702eb99b 100644
--- a/crypto/bio/bss_conn.c
+++ b/crypto/bio/bss_conn.c
@@ -56,14 +56,14 @@
* [including the GNU Public Licence.]
*/
-#ifndef OPENSSL_NO_SOCK
-
#include <stdio.h>
#include <errno.h>
#define USE_SOCKETS
#include "cryptlib.h"
#include <openssl/bio.h>
+#ifndef OPENSSL_NO_SOCK
+
#ifdef OPENSSL_SYS_WIN16
#define SOCKET_PROTOCOL 0 /* more microsoft stupidity */
#else
diff --git a/crypto/bio/bss_sock.c b/crypto/bio/bss_sock.c
index 2c1c405ec7..7207a1fb87 100644
--- a/crypto/bio/bss_sock.c
+++ b/crypto/bio/bss_sock.c
@@ -56,8 +56,6 @@
* [including the GNU Public Licence.]
*/
-#ifndef OPENSSL_NO_SOCK
-
#include <stdio.h>
#include <errno.h>
#define USE_SOCKETS
@@ -279,7 +277,7 @@ int BIO_sock_non_fatal_error(int err)
#endif
#ifdef EAGAIN
-#if EWOULDBLOCK != EAGAIN
+# if EWOULDBLOCK != EAGAIN
case EAGAIN:
# endif
#endif
@@ -302,4 +300,3 @@ int BIO_sock_non_fatal_error(int err)
}
return(0);
}
-#endif