Update to NSPR 4.9.5 Beta 2, part 2: actual changes.

mozilla/nsprpub/pr/include/prtime.h

Index: mozilla/nsprpub/pr/include/prtime.h
===================================================================
--- mozilla/nsprpub/pr/include/prtime.h	(revision 179237)
+++ mozilla/nsprpub/pr/include/prtime.h	(working copy)
@@ -246,17 +246,6 @@
 	PRBool default_to_gmt,
 	PRTime *result);
 
-/*
- * FIXME: should we also have a formatting function, such as asctime, ctime,
- * and strftime in standard C library?  But this would involve
- * internationalization issues.  Might want to provide a US English version.
- */
-
-/**********************************************************************/
-/*********************** OLD COMPATIBILITYFUNCTIONS *******************/
-/**********************************************************************/
-#ifndef NO_NSPR_10_SUPPORT
-
 /* Format a time value into a buffer. Same semantics as strftime() */
 NSPR_API(PRUint32) PR_FormatTime(char *buf, int buflen, const char *fmt,
                                            const PRExplodedTime *tm);
@@ -268,8 +257,6 @@
 PR_FormatTimeUSEnglish( char* buf, PRUint32 bufSize,
                         const char* format, const PRExplodedTime* tm );
 
-#endif /* NO_NSPR_10_SUPPORT */
-
 PR_END_EXTERN_C
 
 #endif /* prtime_h___ */