Fix for bug 228190 . Remove unnecessary NSS_ENABLE_ECC declarations . r=nelson
authorjulien.pierre.bugs%sun.com
Thu, 12 Jul 2007 04:39:19 +0000
changeset 7930 6d8f424d2db1b5d2f049e9986842ca5e8cfee8cc
parent 7928 49e3ff06ac66cf3af48cf511c9c3992493dfac7c
child 7931 4224e7e4b182634d051f97f299bc7b3189b08966
push idunknown
push userunknown
push dateunknown
reviewersnelson
bugs228190
Fix for bug 228190 . Remove unnecessary NSS_ENABLE_ECC declarations . r=nelson
security/nss/cmd/bltest/manifest.mn
security/nss/cmd/certutil/manifest.mn
security/nss/cmd/fipstest/Makefile
security/nss/cmd/lib/manifest.mn
security/nss/cmd/pk12util/manifest.mn
security/nss/cmd/selfserv/manifest.mn
security/nss/cmd/tstclnt/manifest.mn
security/nss/lib/freebl/manifest.mn
security/nss/lib/softoken/legacydb/manifest.mn
security/nss/lib/softoken/manifest.mn
security/nss/lib/ssl/manifest.mn
--- a/security/nss/cmd/bltest/manifest.mn
+++ b/security/nss/cmd/bltest/manifest.mn
@@ -51,12 +51,8 @@ EXPORTS = \
 
 PRIVATE_EXPORTS = \
 	$(NULL)
 
 CSRCS = \
 	blapitest.c \
 	$(NULL)
 
-ifdef NSS_ENABLE_ECC
-DEFINES += -DNSS_ENABLE_ECC
-endif
-
--- a/security/nss/cmd/certutil/manifest.mn
+++ b/security/nss/cmd/certutil/manifest.mn
@@ -49,13 +49,9 @@ CSRCS = \
 	$(NULL)
 
 # The MODULE is always implicitly required.
 # Listing it here in REQUIRES makes it appear twice in the cc command line.
 REQUIRES = dbm seccmd
 
 PROGRAM = certutil
 
-ifdef NSS_ENABLE_ECC
-DEFINES += -DNSS_ENABLE_ECC
-endif
-
 #USE_STATIC_LIBS = 1
--- a/security/nss/cmd/fipstest/Makefile
+++ b/security/nss/cmd/fipstest/Makefile
@@ -57,20 +57,16 @@ include $(CORE_DEPTH)/coreconf/config.mk
 
 
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
 include ../platlibs.mk
 
-ifdef NSS_ENABLE_ECC
-DEFINES += -DNSS_ENABLE_ECC
-endif
-
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
 #######################################################################
 
 include $(CORE_DEPTH)/coreconf/rules.mk
 
 #######################################################################
 # (6) Execute "component" rules. (OPTIONAL)                           #
--- a/security/nss/cmd/lib/manifest.mn
+++ b/security/nss/cmd/lib/manifest.mn
@@ -55,13 +55,9 @@ CSRCS		= secutil.c \
 		moreoids.c \
 		pppolicy.c \
 		secerror.c \
 		ffs.c \
 		$(NULL)
 
 REQUIRES	= dbm
 
-ifdef NSS_ENABLE_ECC
-DEFINES += -DNSS_ENABLE_ECC
-endif
-
 NO_MD_RELEASE	= 1
--- a/security/nss/cmd/pk12util/manifest.mn
+++ b/security/nss/cmd/pk12util/manifest.mn
@@ -47,13 +47,9 @@ CSRCS = \
 	$(NULL)
 
 # The MODULE is always implicitly required.
 # Listing it here in REQUIRES makes it appear twice in the cc command line.
 REQUIRES = dbm seccmd
 
 PROGRAM = pk12util
 
-ifdef NSS_ENABLE_ECC
-DEFINES += -DNSS_ENABLE_ECC
-endif
-
 # USE_STATIC_LIBS = 1
--- a/security/nss/cmd/selfserv/manifest.mn
+++ b/security/nss/cmd/selfserv/manifest.mn
@@ -45,12 +45,8 @@ MODULE = nss
 CSRCS = selfserv.c
 
 # The MODULE is always implicitly required.
 # Listing it here in REQUIRES makes it appear twice in the cc command line.
 REQUIRES = seccmd dbm 
 
 PROGRAM = selfserv
 
-ifdef NSS_ENABLE_ECC
-DEFINES += -DNSS_ENABLE_ECC
-endif
-
--- a/security/nss/cmd/tstclnt/manifest.mn
+++ b/security/nss/cmd/tstclnt/manifest.mn
@@ -47,12 +47,8 @@ MODULE = nss
 REQUIRES = seccmd dbm 
 
 # DIRS = 
 
 CSRCS	= tstclnt.c  
 
 PROGRAM	= tstclnt
 
-ifdef NSS_ENABLE_ECC
-DEFINES += -DNSS_ENABLE_ECC
-endif
-
--- a/security/nss/lib/freebl/manifest.mn
+++ b/security/nss/lib/freebl/manifest.mn
@@ -163,20 +163,16 @@ ALL_HDRS =  \
 	sha.h \
 	sha_fast.h \
 	sha256.h \
 	shsign.h \
 	vis_proto.h \
 	$(NULL)
 
 
-ifdef NSS_ENABLE_ECC
-DEFINES += -DNSS_ENABLE_ECC
-endif
-
 ifdef AES_GEN_TBL
 DEFINES += -DRIJNDAEL_GENERATE_TABLES
 else 
 ifdef AES_GEN_TBL_M
 DEFINES += -DRIJNDAEL_GENERATE_TABLES_MACRO
 else
 ifdef AES_GEN_VAL
 DEFINES += -DRIJNDAEL_GENERATE_VALUES
--- a/security/nss/lib/softoken/legacydb/manifest.mn
+++ b/security/nss/lib/softoken/legacydb/manifest.mn
@@ -57,12 +57,8 @@ CSRCS = \
 	lginit.c \
 	lgutil.c \
 	lowcert.c \
 	lowkey.c \
 	pcertdb.c \
 	pk11db.c \
 	$(NULL)
 
-ifdef NSS_ENABLE_ECC
-DEFINES += -DNSS_ENABLE_ECC
-endif
-
--- a/security/nss/lib/softoken/manifest.mn
+++ b/security/nss/lib/softoken/manifest.mn
@@ -85,16 +85,12 @@ CSRCS = \
 	rsawrapr.c  \
 	sdb.c  \
 	sftkdb.c  \
 	sftkpars.c  \
 	softkver.c  \
 	tlsprf.c   \
 	$(NULL)
 
-ifdef NSS_ENABLE_ECC
-DEFINES += -DNSS_ENABLE_ECC
-endif
-
 ifdef SQLITE_UNSAFE_THREADS
 DEFINES += -DSQLITE_UNSAFE_THREADS
 endif
 
--- a/security/nss/lib/ssl/manifest.mn
+++ b/security/nss/lib/ssl/manifest.mn
@@ -75,15 +75,11 @@ CSRCS = \
 	sslver.c \
 	authcert.c \
 	cmpcert.c \
 	nsskea.c \
 	sslinfo.c \
 	ssl3ecc.c \
 	$(NULL)
 
-ifdef NSS_ENABLE_ECC
-DEFINES += -DNSS_ENABLE_ECC
-endif
-
 LIBRARY_NAME = ssl
 LIBRARY_VERSION = 3