Fix #25042. Moving PR_Init_Log proto from prlog.h to pprio.h as it is an internal function that normally doesn't belong in the NSPR public interfaces but the Mac needs it. Changes actually from wtc, sdagley just reviewed them and is checking them in.

netwerk/test/TestSocketTransport.cpp

@@ -27,6 +27,9 @@
 #endif
 
 #include "nspr.h"
+#ifdef XP_MAC
+#include "pprio.h"	// PR_Init_Log
+#endif
 
 #define NSPIPE2
 

nsprpub/pr/include/private/pprio.h

@@ -229,6 +229,15 @@ NSPR_API(PRStatus) PR_NT_CancelIo(PRFileDesc *fd);
 
 #endif /* WIN32 */
 
+/*
+** Need external access to this on Mac so we can first set up our faux
+** environment vars
+*/
+#ifdef XP_MAC
+NSPR_API(void) PR_Init_Log(void);
+#endif
+
+
 PR_END_EXTERN_C
 
 #endif /* pprio_h___ */

nsprpub/pr/include/prlog.h

@@ -170,12 +170,6 @@ NSPR_API(void) PR_LogPrint(const char *fmt, ...);
 */
 NSPR_API(void) PR_LogFlush(void);
 
-/* Need external access to this on Mac so we can first set up our faux environment vars */
-#ifdef XP_MAC
-NSPR_API(void) PR_Init_Log(void);
-#endif
-
-
 /*
 ** Windoze 16 can't support a large static string space for all of the
 ** various debugging strings so logging is not enabled for it.

xpfe/appshell/src/nsCommandLineServiceMac.cpp

@@ -47,7 +47,7 @@ static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
 #include "prmem.h"
 #include "plstr.h"
 #include "prenv.h"
-#include "prlog.h"
+#include "pprio.h"	// PR_Init_Log
 
 // Universal
 #include <AppleEvents.h>

xpfe/components/startup/src/nsCommandLineServiceMac.cpp

@@ -47,7 +47,7 @@ static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
 #include "prmem.h"
 #include "plstr.h"
 #include "prenv.h"
-#include "prlog.h"
+#include "pprio.h"	// PR_Init_Log
 
 // Universal
 #include <AppleEvents.h>