diff --git a/nsprpub/TAG-INFO b/nsprpub/TAG-INFO index b4529b708d23..8c8e92272496 100644 --- a/nsprpub/TAG-INFO +++ b/nsprpub/TAG-INFO @@ -1 +1 @@ -NSPR_4_8_9_BETA4 +NSPR_4_8_9_BETA5 diff --git a/nsprpub/config/prdepend.h b/nsprpub/config/prdepend.h index df72c56882d2..55444c40b3aa 100644 --- a/nsprpub/config/prdepend.h +++ b/nsprpub/config/prdepend.h @@ -42,3 +42,4 @@ */ #error "Do not include this header file." + diff --git a/nsprpub/configure b/nsprpub/configure index 8b7c20d0c647..dc2de9b0a772 100755 --- a/nsprpub/configure +++ b/nsprpub/configure @@ -3120,14 +3120,14 @@ fi -case "${target}" in -arm-android-eabi) +case "${CPU_ARCH}-${OS_TARGET}" in +arm-Android) MOZ_THUMB=yes MOZ_ARCH=armv7-a MOZ_FPU=vfp MOZ_FLOAT_ABI=softfp ;; -arm*-*) +arm-*) if test -n "$MOZ_PLATFORM_MAEMO"; then MOZ_THUMB=no MOZ_ARCH=armv7-a diff --git a/nsprpub/configure.in b/nsprpub/configure.in index 81e9c1fab4c0..39c96a3086b1 100644 --- a/nsprpub/configure.in +++ b/nsprpub/configure.in @@ -930,14 +930,14 @@ dnl = ARM toolchain tweaks dnl ======================================================== dnl Defaults -case "${target}" in -arm-android-eabi) +case "${CPU_ARCH}-${OS_TARGET}" in +arm-Android) MOZ_THUMB=yes MOZ_ARCH=armv7-a MOZ_FPU=vfp MOZ_FLOAT_ABI=softfp ;; -arm*-*) +arm-*) if test -n "$MOZ_PLATFORM_MAEMO"; then MOZ_THUMB=no MOZ_ARCH=armv7-a diff --git a/nsprpub/lib/ds/plarenas.h b/nsprpub/lib/ds/plarenas.h index 778d3af5dec0..9c9eee8ecd6a 100644 --- a/nsprpub/lib/ds/plarenas.h +++ b/nsprpub/lib/ds/plarenas.h @@ -35,40 +35,13 @@ * * ***** END LICENSE BLOCK ***** */ -#if defined(PLARENAS_H) -#else /* defined(PLARENAS_H) */ +#ifndef PLARENAS_H #define PLARENAS_H PR_BEGIN_EXTERN_C typedef struct PLArenaPool PLArenaPool; -/* -** Allocate an arena pool as specified by the parameters. -** -** This is equivelant to allocating the space yourself and then -** calling PL_InitArenaPool(). -** -** This function may fail (and return a NULL) for a variety of -** reasons. The reason for a particular failure can be discovered -** by calling PR_GetError(). -*/ -#if 0 /* Not implemented */ -PR_EXTERN(PLArenaPool*) PL_AllocArenaPool( - const char *name, PRUint32 size, PRUint32 align); -#endif - -/* -** Destroy an arena pool previously allocated by PL_AllocArenaPool(). -** -** This function may fail if the arena is not empty and the caller -** wishes to check for empty upon descruction. -*/ -#if 0 /* Not implemented */ -PR_EXTERN(PRStatus) PL_DestroyArenaPool(PLArenaPool *pool, PRBool checkEmpty); -#endif - - /* ** Initialize an arena pool with the given name for debugging and metering, ** with a minimum size per arena of size bytes. @@ -95,6 +68,7 @@ PR_EXTERN(void) PL_FinishArenaPool(PLArenaPool *pool); /* ** Compact all of the arenas in a pool so that no space is wasted. +** NOT IMPLEMENTED. Do not use. **/ PR_EXTERN(void) PL_CompactArenaPool(PLArenaPool *pool); @@ -115,6 +89,4 @@ PR_EXTERN(void) PL_ClearArenaPool(PLArenaPool *pool, PRInt32 pattern); PR_END_EXTERN_C -#endif /* defined(PLARENAS_H) */ - -/* plarenas */ +#endif /* PLARENAS_H */ diff --git a/nsprpub/pr/src/md/windows/w32poll.c b/nsprpub/pr/src/md/windows/w32poll.c index de451cddaac3..2caaac2aa7aa 100644 --- a/nsprpub/pr/src/md/windows/w32poll.c +++ b/nsprpub/pr/src/md/windows/w32poll.c @@ -288,8 +288,6 @@ PRInt32 _PR_MD_PR_POLL(PRPollDesc *pds, PRIntn npds, PRIntervalTime timeout) */ if (ready > 0) { - PR_ASSERT(rd.fd_count || wt.fd_count || ex.fd_count); - ready = 0; for (pd = pds, epd = pd + npds; pd < epd; pd++) { @@ -301,7 +299,6 @@ PRInt32 _PR_MD_PR_POLL(PRPollDesc *pds, PRIntn npds, PRIntervalTime timeout) PR_ASSERT(NULL != bottom); osfd = (SOCKET) bottom->secret->md.osfd; - PR_ASSERT(INVALID_SOCKET != osfd); if (FD_ISSET(osfd, &rd)) { @@ -309,13 +306,6 @@ PRInt32 _PR_MD_PR_POLL(PRPollDesc *pds, PRIntn npds, PRIntervalTime timeout) out_flags |= PR_POLL_READ; if (pd->out_flags & _PR_POLL_WRITE_SYS_READ) out_flags |= PR_POLL_WRITE; - - // Adding assertion for |pd->out_flags| before |out_flags| - // to recognize if we have some out flags set on the socket - // or not ; if we do, then the out flags are not one of - // flags tested above - PR_ASSERT(pd->out_flags); - PR_ASSERT(out_flags); } if (FD_ISSET(osfd, &wt)) { @@ -323,35 +313,12 @@ PRInt32 _PR_MD_PR_POLL(PRPollDesc *pds, PRIntn npds, PRIntervalTime timeout) out_flags |= PR_POLL_READ; if (pd->out_flags & _PR_POLL_WRITE_SYS_WRITE) out_flags |= PR_POLL_WRITE; - - PR_ASSERT(pd->out_flags); - PR_ASSERT(out_flags); } if (FD_ISSET(osfd, &ex)) out_flags |= PR_POLL_EXCEPT; } pd->out_flags = out_flags; if (out_flags) ready++; } -#ifdef DEBUG - if (ready == 0) { - printf("No ready socket but should be at least one, dumping: \n"); - for (pd = pds, epd = pd + npds; pd < epd; pd++) - { - SOCKET osfd; - if (pd->fd) { - bottom = PR_GetIdentitiesLayer(pd->fd, PR_NSPR_IO_LAYER); - osfd = (SOCKET) bottom->secret->md.osfd; - printf("\tfd=%p, in=%d, out=%d, osfd=%x / rd:%d wt:%d, ex:%d\n", - pd->fd, pd->in_flags, pd->out_flags, osfd, - FD_ISSET(osfd, &rd), FD_ISSET(osfd, &wt), FD_ISSET(osfd, &ex)); - } - else { - printf("\tfd=NULL !\n"); - } - - } - } -#endif PR_ASSERT(ready > 0); } else if (ready == SOCKET_ERROR) diff --git a/nsprpub/tools/httpget.c b/nsprpub/tools/httpget.c index 774a4c7a7b32..18d9fa2ba43a 100644 --- a/nsprpub/tools/httpget.c +++ b/nsprpub/tools/httpget.c @@ -201,14 +201,13 @@ PRStatus FastFetchFile(PRFileDesc *in, PRFileDesc *out, PRUint32 size) outfMap = PR_CreateFileMap(out, sz64, PR_PROT_READWRITE); PR_ASSERT(outfMap); addr = PR_MemMap(outfMap, LL_ZERO, size); - if (addr == (void *) -1) { + if (addr == NULL) { fprintf(stderr, "cannot memory-map file: (%d, %d)\n", PR_GetError(), PR_GetOSError()); PR_CloseFileMap(outfMap); return PR_FAILURE; } - PR_ASSERT(addr != (void *) -1); start = (char *) addr; rem = size; while ((nBytes = DrainInputBuffer(start, rem)) > 0) {