Commit 23f2dbec authored by Kai Engert's avatar Kai Engert
Browse files

Bug 618368, Mozilla upgrade to NSS 3.12.9 final (includes NSPR 4.8.7 final).... 

Bug 618368, Mozilla upgrade to NSS 3.12.9 final (includes NSPR 4.8.7 final). a=blocking-fennec-2.0+=doug.turner
parent 28af78a3

nsprpub/TAG-INFO

+1 −1
Original line number Diff line number Diff line 
NSPR_4_8_7_BETA2
 
NSPR_4_8_7_RTM

nsprpub/config/prdepend.h

+1 −0
Original line number Diff line number Diff line
@@ -43,3 +43,4 @@ 


#error "Do not include this header file."

nsprpub/config/rules.mk

+8 −0
Original line number Diff line number Diff line
@@ -462,6 +462,14 @@ $(filter $(OBJDIR)/%.$(OBJ_SUFFIX),$(OBJS)): $(OBJDIR)/%.$(OBJ_SUFFIX): $(DUMMY_ 
# Special gmake rules.

################################################################################



#

# Disallow parallel builds with MSVC < 8 since it can't open the PDB file in

# parallel.

#

ifeq (,$(filter-out 1200 1300 1310,$(MSC_VER)))

.NOTPARALLEL:

endif



#

# Re-define the list of default suffixes, so gmake won't have to churn through

# hundreds of built-in suffix rules for stuff we don't need.

nsprpub/pr/include/prinit.h

+2 −2
Original line number Diff line number Diff line
@@ -63,11 +63,11 @@ PR_BEGIN_EXTERN_C 
** The format of the version string is

**     "<major version>.<minor version>[.<patch level>] [<Beta>]"

*/

#define PR_VERSION  "4.8.7 Beta"

#define PR_VERSION  "4.8.7"

#define PR_VMAJOR   4

#define PR_VMINOR   8

#define PR_VPATCH   7

#define PR_BETA     PR_TRUE

#define PR_BETA     PR_FALSE



/*

** PRVersionCheck

security/coreconf/coreconf.dep

+1 −0
Original line number Diff line number Diff line
@@ -44,3 +44,4 @@ 
#error "Do not include this header file."