Remove old communicator stuff from libjar so modutil will build now.

security/nss/lib/jar/jarevil.c

@@ -48,7 +48,7 @@
 #include "jarevil.h"
 
 /* from libevent.h */
-#ifdef MOZILLA_CLIENT
+#ifdef MOZILLA_CLIENT_OLD
 typedef void (*ETVoidPtrFunc) (void * data);
 extern void ET_moz_CallFunction (ETVoidPtrFunc fn, void *data);
 
@@ -152,7 +152,7 @@ SECStatus jar_moz_encode
   encode_data->pwfnarg   = pwfnarg;
 
   /* Synchronously invoke the callback function on the mozilla thread. */
-#ifdef MOZILLA_CLIENT
+#ifdef MOZILLA_CLIENT_OLD
   if (mozilla_event_queue)
     ET_moz_CallFunction (jar_moz_encode_fn, encode_data);
   else
@@ -231,7 +231,7 @@ SECStatus jar_moz_verify
   verify_data->keepcerts       = keepcerts;
 
   /* Synchronously invoke the callback function on the mozilla thread. */
-#ifdef MOZILLA_CLIENT
+#ifdef MOZILLA_CLIENT_OLD
   if (mozilla_event_queue)
     ET_moz_CallFunction (jar_moz_verify_fn, verify_data);
   else
@@ -295,7 +295,7 @@ CERTCertificate *jar_moz_nickname (CERTCertDBHandle *certdb, char *nickname)
   nickname_data->nickname = nickname;
 
   /* Synchronously invoke the callback function on the mozilla thread. */
-#ifdef MOZILLA_CLIENT
+#ifdef MOZILLA_CLIENT_OLD
   if (mozilla_event_queue)
     ET_moz_CallFunction (jar_moz_nickname_fn, nickname_data);
   else
@@ -362,7 +362,7 @@ SECStatus jar_moz_perm
   perm_data->trust    = trust;
 
   /* Synchronously invoke the callback function on the mozilla thread. */
-#ifdef MOZILLA_CLIENT
+#ifdef MOZILLA_CLIENT_OLD
   if (mozilla_event_queue)
     ET_moz_CallFunction (jar_moz_perm_fn, perm_data);
   else
@@ -426,7 +426,7 @@ CERTCertificate *jar_moz_certkey (CERTCertDBHandle *certdb, SECItem *seckey)
   certkey_data->seckey = seckey;
 
   /* Synchronously invoke the callback function on the mozilla thread. */
-#ifdef MOZILLA_CLIENT
+#ifdef MOZILLA_CLIENT_OLD
   if (mozilla_event_queue)
     ET_moz_CallFunction (jar_moz_certkey_fn, certkey_data);
   else
@@ -489,7 +489,7 @@ CERTCertificate *jar_moz_issuer (CERTCertificate *cert)
   issuer_data->cert  = cert;
 
   /* Synchronously invoke the callback function on the mozilla thread. */
-#ifdef MOZILLA_CLIENT
+#ifdef MOZILLA_CLIENT_OLD
   if (mozilla_event_queue)
     ET_moz_CallFunction (jar_moz_issuer_fn, issuer_data);
   else
@@ -551,7 +551,7 @@ CERTCertificate *jar_moz_dup (CERTCertificate *cert)
   dup_data->cert  = cert;
 
   /* Synchronously invoke the callback function on the mozilla thread. */
-#ifdef MOZILLA_CLIENT
+#ifdef MOZILLA_CLIENT_OLD
   if (mozilla_event_queue)
     ET_moz_CallFunction (jar_moz_dup_fn, dup_data);
   else

security/nss/lib/jar/jarnav.c

@@ -42,7 +42,7 @@
 #include "jarint.h"
 
 /* from proto.h */
-#ifdef MOZILLA_CLIENT
+#ifdef MOZILLA_CLIENT_OLD
 extern MWContext *XP_FindSomeContext(void);
 #endif
 
@@ -64,7 +64,7 @@ static MWContext *(*jar_fn_GetInitContext) (void) = NULL;
 
 void JAR_init (void)
   {
-#ifdef MOZILLA_CLIENT
+#ifdef MOZILLA_CLIENT_OLD
   JAR_init_callbacks (XP_GetString, XP_FindSomeContext, FE_GetInitContext);
 #else
   JAR_init_callbacks (XP_GetString, NULL, NULL);

security/nss/lib/jar/jarsign.c

@@ -37,6 +37,7 @@
  *  Routines used in signing archives.
  */
 
+
 #define USE_MOZ_THREAD
 
 #include "jar.h"
@@ -51,7 +52,7 @@
 /* from libevent.h */
 typedef void (*ETVoidPtrFunc) (void * data);
 
-#ifdef MOZILLA_CLIENT
+#ifdef MOZILLA_CLIENT_OLD
 
 extern void ET_moz_CallFunction (ETVoidPtrFunc fn, void *data);
 
@@ -314,7 +315,7 @@ int jar_create_pk7
   /* signtool must use any old context it can find since it's
      calling from inside javaland. */
 
-#ifdef MOZILLA_CLIENT
+#ifdef MOZILLA_CLIENT_OLD
   mw = XP_FindSomeContext();
 #else
   mw = NULL;

security/nss/lib/jar/jarver.c

@@ -1672,7 +1672,7 @@ static int jar_validate_pkcs7
 
   /* We need a context if we can get one */
 
-#ifdef MOZILLA_CLIENT
+#ifdef MOZILLA_CLIENT_OLD
   if (jar->mw == NULL) {
     JAR_set_context (jar, NULL);
   }