projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use new-style system-id macros everywhere possible. I hope I haven't
[openssl.git]
/
crypto
/
bio
/
b_sock.c
diff --git
a/crypto/bio/b_sock.c
b/crypto/bio/b_sock.c
index 35d2e5b6f33ef1f8827391b6c481aebb5a0be97e..d4b44b62bbaac55f55c488eb6ba16dd6e78229ba 100644
(file)
--- a/
crypto/bio/b_sock.c
+++ b/
crypto/bio/b_sock.c
@@
-65,7
+65,7
@@
#include "cryptlib.h"
#include <openssl/bio.h>
#include "cryptlib.h"
#include <openssl/bio.h>
-#ifdef WIN16
+#ifdef
OPENSSL_SYS_
WIN16
#define SOCKET_PROTOCOL 0 /* more microsoft stupidity */
#else
#define SOCKET_PROTOCOL IPPROTO_TCP
#define SOCKET_PROTOCOL 0 /* more microsoft stupidity */
#else
#define SOCKET_PROTOCOL IPPROTO_TCP
@@
-79,7
+79,7
@@
#define MAX_LISTEN 32
#endif
#define MAX_LISTEN 32
#endif
-#ifdef WINDOWS
+#ifdef
OPENSSL_SYS_
WINDOWS
static int wsa_init_done=0;
#endif
static int wsa_init_done=0;
#endif
@@
-429,7
+429,7
@@
end:
int BIO_sock_init(void)
{
int BIO_sock_init(void)
{
-#ifdef WINDOWS
+#ifdef
OPENSSL_SYS_
WINDOWS
static struct WSAData wsa_state;
if (!wsa_init_done)
static struct WSAData wsa_state;
if (!wsa_init_done)
@@
-449,13
+449,13
@@
int BIO_sock_init(void)
return(-1);
}
}
return(-1);
}
}
-#endif /* WINDOWS */
+#endif /*
OPENSSL_SYS_
WINDOWS */
return(1);
}
void BIO_sock_cleanup(void)
{
return(1);
}
void BIO_sock_cleanup(void)
{
-#ifdef WINDOWS
+#ifdef
OPENSSL_SYS_
WINDOWS
if (wsa_init_done)
{
wsa_init_done=0;
if (wsa_init_done)
{
wsa_init_done=0;
@@
-465,7
+465,7
@@
void BIO_sock_cleanup(void)
#endif
}
#endif
}
-#if !defined(VMS) || __VMS_VER >= 70000000
+#if !defined(
OPENSSL_SYS_
VMS) || __VMS_VER >= 70000000
int BIO_socket_ioctl(int fd, long type, unsigned long *arg)
{
int BIO_socket_ioctl(int fd, long type, unsigned long *arg)
{