diff options
| author | wtc%netscape.com <devnull@localhost> | 2001-03-02 02:40:52 +0000 |
|---|---|---|
| committer | wtc%netscape.com <devnull@localhost> | 2001-03-02 02:40:52 +0000 |
| commit | 9818c943b104bd148c6d45eafba5089ca4ed905b (patch) | |
| tree | e634cd2b87d9581b42d7364e04cfa50fcb9d4e5d /pr/include | |
| parent | 80839b8b032ffb7f8696578b49c68c3bcb04b80d (diff) | |
| download | nspr-hg-9818c943b104bd148c6d45eafba5089ca4ed905b.tar.gz | |
Bugzilla bug #62877: checked in patches contributed by Javier Pedemonte
<pedemont@us.ibm.com> and Dmitry Kubov <dmitry@north.cs.msu.su>.
Modified files: prinet.h, _os2.h, os2poll.c, and os2sock.c.
Diffstat (limited to 'pr/include')
| -rw-r--r-- | pr/include/md/_os2.h | 12 | ||||
| -rw-r--r-- | pr/include/prinet.h | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/pr/include/md/_os2.h b/pr/include/md/_os2.h index 417f721c..70cf9450 100644 --- a/pr/include/md/_os2.h +++ b/pr/include/md/_os2.h @@ -59,6 +59,11 @@ #define sock_errno() errno #define soclose close #define sock_init() + +#include <sys/builtin.h> +#include <sys/smutex.h> +static _smutex _md_shm_lock = 0; + #endif /* @@ -269,7 +274,14 @@ extern PRInt32 _MD_CloseSocket(PRInt32 osfd); #define _MD_GETPEERNAME (_PR_MD_GETPEERNAME) #define _MD_GETSOCKOPT (_PR_MD_GETSOCKOPT) #define _MD_SETSOCKOPT (_PR_MD_SETSOCKOPT) + +#ifdef XP_OS2_EMX +extern PRInt32 _MD_SELECT(int nfds, fd_set *readfds, fd_set *writefds, + fd_set *exceptfds, struct timeval *timeout); +#else #define _MD_SELECT select +#endif + #define _MD_FSYNC _PR_MD_FSYNC #define _MD_SET_FD_INHERITABLE (_PR_MD_SET_FD_INHERITABLE) diff --git a/pr/include/prinet.h b/pr/include/prinet.h index 842650a9..f5aea7eb 100644 --- a/pr/include/prinet.h +++ b/pr/include/prinet.h @@ -91,7 +91,7 @@ struct sockaddr_dl; * socket headers. */ #if defined(OS2) && !defined(INADDR_LOOPBACK) -#define INADDR_LOOPBACK gethostid() +#define INADDR_LOOPBACK 0x7f000001 #endif /* |