remove NSPR20 #ifdef

lib/mailto/msgsend.cpp

@@ -2752,13 +2752,8 @@ mime_generate_headers (MSG_CompositionFields *fields,
 			  localtime (&now));
 #else
 	int gmtoffset = XP_LocalZoneOffset();
-#ifndef NSPR20
-    PRTime now;
-    PR_ExplodeTime(&now, PR_Now());
-#else
     PRExplodedTime now;
     PR_ExplodeTime(PR_Now(), PR_LocalTimeParameters, &now);
-#endif /* NSPR20 */
 
 	/* Use PR_FormatTimeUSEnglish() to format the date in US English format,
 	   then figure out what our local GMT offset is, and append it (since

network/main/mkautocf.c

@@ -1342,14 +1342,9 @@ proxy_isResolvable(JSContext *mc, JSObject *obj, unsigned int argc,
     if (argc >= 1 && JSVAL_IS_STRING(argv[0])) {
 	const char *h = JS_GetStringBytes(JSVAL_TO_STRING(argv[0]));
 	PRHostEnt *hp = NULL;
-#ifdef NSPR20
 	PRStatus rv;
     PRHostEnt hpbuf;
     char dbbuf[PR_NETDB_BUF_SIZE];
-#elif defined(XP_UNIX) || defined(XP_WIN32)
-	PRHostEnt hpbuf;
-	char dbbuf[PR_NETDB_BUF_SIZE];
-#endif
 
 	if (h) {
 	    char *safe = PL_strdup(h);