diff options
| author | wtc%netscape.com <devnull@localhost> | 2002-05-01 00:21:50 +0000 |
|---|---|---|
| committer | wtc%netscape.com <devnull@localhost> | 2002-05-01 00:21:50 +0000 |
| commit | c1397d8d38f3d4f6766618ac1be9a6854781c9a6 (patch) | |
| tree | 59e7e718bded3509ff76249a736157c78879cfe7 /security/nss | |
| parent | e23f0cc1fb3ec79374a9fe8f4d475f12d0838550 (diff) | |
| download | nss-hg-c1397d8d38f3d4f6766618ac1be9a6854781c9a6.tar.gz | |
Bugzilla bug 127062: use PR_MSG_PEEK instead of MSG_PEEK.
Diffstat (limited to 'security/nss')
| -rw-r--r-- | security/nss/lib/ssl/sslsecur.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/security/nss/lib/ssl/sslsecur.c b/security/nss/lib/ssl/sslsecur.c index 85bb024c8..e5c2bc136 100644 --- a/security/nss/lib/ssl/sslsecur.c +++ b/security/nss/lib/ssl/sslsecur.c @@ -43,16 +43,6 @@ #include "secoid.h" /* for SECOID_GetALgorithmTag */ #include "pk11func.h" /* for PK11_GenerateRandom */ -#if defined(_WINDOWS) -#include "winsock.h" /* for MSG_PEEK */ -#elif defined(XP_MAC) -#include "macsocket.h" -#elif defined(BEOS) -#define MSG_PEEK 0x2 -#else -#include <sys/socket.h> /* for MSG_PEEK */ -#endif - #define MAX_BLOCK_CYPHER_SIZE 32 #define TEST_FOR_FAILURE /* reminder */ @@ -549,7 +539,7 @@ DoRecv(sslSocket *ss, unsigned char *out, int len, int flags) /* Dole out clear data to reader */ amount = PR_MIN(len, available); PORT_Memcpy(out, ss->gs.buf.buf + ss->gs.readOffset, amount); - if (!(flags & MSG_PEEK)) { + if (!(flags & PR_MSG_PEEK)) { ss->gs.readOffset += amount; } rv = amount; @@ -952,7 +942,7 @@ ssl_SecureRecv(sslSocket *ss, unsigned char *buf, int len, int flags) PORT_SetError(PR_SOCKET_SHUTDOWN_ERROR); return PR_FAILURE; } - if (flags & ~MSG_PEEK) { + if (flags & ~PR_MSG_PEEK) { PORT_SetError(PR_INVALID_ARGUMENT_ERROR); return PR_FAILURE; } |