Bug 992471: Update to NSPR_4_10_5_BETA4.

This commit is contained in:
Wan-Teh Chang 2014-04-27 19:59:07 -07:00
parent a24a270b5d
commit e9ca87469a
5 changed files with 6 additions and 12 deletions

View File

@ -1 +1 @@
NSPR_4_10_5_BETA3
NSPR_4_10_5_BETA4

View File

@ -10,4 +10,3 @@
*/
#error "Do not include this header file."

5
nsprpub/configure vendored
View File

@ -3128,8 +3128,7 @@ else
fi
if test -z "$SKIP_COMPILER_CHECKS"; then
if test "$target" != "$host" -o -n "$CROSS_COMPILE"; then
if test "$target" != "$host"; then
echo "cross compiling from $host to $target"
cross_compiling=yes
@ -3984,7 +3983,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test "$target" != "$host" -o -n "$CROSS_COMPILE"; then
if test "$target" != "$host"; then
if test -n "$USE_CPLUS"; then
for ac_prog in $CXX "${target_alias}-g++" "${target}-g++"
do

View File

@ -570,11 +570,7 @@ if test -z "$SKIP_COMPILER_CHECKS"; then
dnl ========================================================
dnl Checks for compilers.
dnl ========================================================
dnl Explicitly honor $CROSS_COMPILE to allow cross-compiling
dnl between toolkits on the same architecture, as when
dnl targeting the iOS Simulator from OS X.
if test "$target" != "$host" -o -n "$CROSS_COMPILE"; then
if test "$target" != "$host"; then
echo "cross compiling from $host to $target"
cross_compiling=yes
@ -613,7 +609,7 @@ dnl and before invoking AC_TRY_COMPILE (which requires AC_PROG_CC).
AC_PROG_CC
dnl Reenter the conditional blocks after invoking AC_PROG_CC.
if test "$target" != "$host" -o -n "$CROSS_COMPILE"; then
if test "$target" != "$host"; then
if test -n "$USE_CPLUS"; then
AC_CHECK_PROGS(CXX, $CXX "${target_alias}-g++" "${target}-g++", echo)
unset ac_cv_prog_CXX

View File

@ -514,7 +514,7 @@ error2:
pthread_mutex_destroy(&mon->lock);
error1:
PR_Free(mon);
PR_SetError(PR_OPERATION_NOT_SUPPORTED_ERROR, 0);
_PR_MD_MAP_DEFAULT_ERROR(rv);
return NULL;
} /* PR_NewMonitor */