diff options
| author | cvs2hg <devnull@localhost> | 2000-06-29 00:47:15 +0000 |
|---|---|---|
| committer | cvs2hg <devnull@localhost> | 2000-06-29 00:47:15 +0000 |
| commit | c88ec696c642fc04e6ff1590ecf12c04315faa33 (patch) | |
| tree | 588ffc8235c9f6f9b780132c4036cb12c54ffa34 | |
| parent | 52bffbd0f918d5af3ac5cd5bf7241bb4d7900c7d (diff) | |
| download | nspr-hg-c88ec696c642fc04e6ff1590ecf12c04315faa33.tar.gz | |
fixup commit for tag 'NSPRPUB_RELEASE_4_0_1'NSPRPUB_RELEASE_4_0_1
| -rw-r--r-- | config/WIN32.mk | 7 | ||||
| -rw-r--r-- | pr/include/prinit.h | 4 | ||||
| -rw-r--r-- | pr/src/md/windows/ntio.c | 9 |
3 files changed, 8 insertions, 12 deletions
diff --git a/config/WIN32.mk b/config/WIN32.mk index 375c80c3..8c4fc172 100644 --- a/config/WIN32.mk +++ b/config/WIN32.mk @@ -53,14 +53,7 @@ OS_CFLAGS = -W3 -nologo -GF -Gy ifdef BUILD_OPT OS_CFLAGS += -MD -# The -O2 optimization of MSVC 6.0 SP3 appears to generate -# code that is unsafe for our use of fibers and static thread -# local storage. We temporarily work around this problem by -# turning off global optimizations (-Og). OPTIMIZER = -O2 -ifeq ($(OS_TARGET),WINNT) -OPTIMIZER += -Og- -endif DEFINES = -UDEBUG -U_DEBUG -DNDEBUG DLLFLAGS = -OUT:"$@" OBJDIR_TAG = _OPT diff --git a/pr/include/prinit.h b/pr/include/prinit.h index 500182c3..5fd58826 100644 --- a/pr/include/prinit.h +++ b/pr/include/prinit.h @@ -44,10 +44,10 @@ PR_BEGIN_EXTERN_C ** The format of the version string is ** "<major version>.<minor version> <build date>" */ -#define PR_VERSION "4.0" +#define PR_VERSION "4.0.1" #define PR_VMAJOR 4 #define PR_VMINOR 0 -#define PR_VPATCH 0 +#define PR_VPATCH 1 #define PR_BETA PR_FALSE /* diff --git a/pr/src/md/windows/ntio.c b/pr/src/md/windows/ntio.c index 5326be68..fb8cc5ff 100644 --- a/pr/src/md/windows/ntio.c +++ b/pr/src/md/windows/ntio.c @@ -744,7 +744,7 @@ void _PR_Unblock_IO_Wait(PRThread *thr) * this thread will continue to run on the same cpu until the * I/O is aborted by closing the FD or calling CancelIO */ - thr->md.thr_bound_cpu = me->cpu; + thr->md.thr_bound_cpu = cpu; PR_ASSERT(!(thr->flags & _PR_IDLE_THREAD)); _PR_AddThreadToRunQ(me, thr); @@ -2044,7 +2044,7 @@ _PR_MD_GETPEERNAME(PRFileDesc *fd, PRNetAddr *addr, PRUint32 *len) PR_SetError(PR_NOT_CONNECTED_ERROR, 0); return PR_FAILURE; } - *len = PR_NETADDR_SIZE(addr); + *len = PR_NETADDR_SIZE(&fd->secret->md.peer_addr); memcpy(addr, &fd->secret->md.peer_addr, *len); return PR_SUCCESS; } else { @@ -3016,7 +3016,10 @@ _PR_MD_GETFILEINFO64(const char *fn, PRFileInfo64 *info) } len = GetFullPathName(fn, sizeof(pathbuf), pathbuf, &filePart); - PR_ASSERT(0 != len); + if (0 == len) { + _PR_MD_MAP_OPENDIR_ERROR(GetLastError()); + return -1; + } if (len > sizeof(pathbuf)) { PR_SetError(PR_NAME_TOO_LONG_ERROR, 0); return -1; |