Bugzilla bug 249782: make NSPR compile with Microsoft Visual Studio 2005. NSPRPUB_PRE_4_2_CLIENT_BRANCH
authorwchang0222%aol.com
Mon, 08 Nov 2004 02:50:18 +0000
branchNSPRPUB_PRE_4_2_CLIENT_BRANCH
changeset 3213 371c3597b58f2bd40c17f4c24d470716329bc940
parent 3212 dfc6ff203118f47915f5d38d0ba10dacc629fa16
child 3214 d7650d0ba52ffca9f2efffcf6af0ee5304b4b656
child 3217 3edfae65f9608a3a9d020a8da2fb4177f983fa84
push idunknown
push userunknown
push dateunknown
bugs249782
Bugzilla bug 249782: make NSPR compile with Microsoft Visual Studio 2005. The -DEBUGTYPE flag is no longer supported. Since -DEBUGTYPE:CV is the default, we simply delete it. The patch is contributed by Stephen Walker <sdwalker@myrealbox.com>. r=wtc. Modified Files: Tag: NSPRPUB_PRE_4_2_CLIENT_BRANCH pr/src/cplus/tests/Makefile.in pr/src/misc/Makefile.in
pr/src/cplus/tests/Makefile.in
pr/src/misc/Makefile.in
--- a/pr/src/cplus/tests/Makefile.in
+++ b/pr/src/cplus/tests/Makefile.in
@@ -127,17 +127,17 @@ ifeq ($(OS_ARCH), SunOS)
     endif # LOCAL_THREADS_ONLY
 endif # SunOS
 
 ifeq ($(OS_ARCH), WINNT)
 ifeq ($(OS_TARGET), WIN16)
   LIBPR = $(dist_libdir)/nspr$(MOD_MAJOR_VERSION).lib
   LIBPL = $(dist_libdir)/plc$(MOD_MAJOR_VERSION).lib
 else
-  LDOPTS = -NOLOGO -DEBUG -DEBUGTYPE:CV -INCREMENTAL:NO
+  LDOPTS = -NOLOGO -DEBUG -INCREMENTAL:NO
   LIBPR = $(dist_libdir)/libnspr$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)
   LIBPL = $(dist_libdir)/libplc$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)
 endif
 endif
 
 ifeq ($(OS_ARCH),OS2)
   ifeq ($(MOZ_OS2_TOOLS),VACPP)
     LDOPTS = -NOE -DEBUG -nologo -PMTYPE:VIO
--- a/pr/src/misc/Makefile.in
+++ b/pr/src/misc/Makefile.in
@@ -88,17 +88,21 @@ include $(topsrcdir)/config/rules.mk
 
 # Prevent floating point errors caused by MSVC 6.0 Processor Pack
 # optimizations (bug 207421).  This disables optimizations that
 # could change the precision of floating-point calculations for
 # this single compilation unit.
 ifeq ($(NS_USE_GCC)_$(OS_ARCH),_WINNT)
 $(OBJDIR)/prdtoa.$(OBJ_SUFFIX): prdtoa.c
 	@$(MAKE_OBJDIR)
+ifeq (,$(filter-out 1100 1200 1300 1310,$(MSC_VER)))
 	$(CC) -Fo$@ -c $(CFLAGS) -Op $(call abspath,$<)
+else
+	$(CC) -Fo$@ -c $(CFLAGS) -fp:precise $(call abspath,$<)
+endif
 endif
 
 #
 # Generate prerr.h, prerr.c, and prerr.properties from prerr.et.
 #
 build_prerr:
 	cd $(srcdir); $(PERL) compile-et.pl prerr.et