diff --git a/mozilla/netwerk/test/TestSocketTransport.cpp b/mozilla/netwerk/test/TestSocketTransport.cpp index da185f05745..8dd2b7a1c6e 100644 --- a/mozilla/netwerk/test/TestSocketTransport.cpp +++ b/mozilla/netwerk/test/TestSocketTransport.cpp @@ -27,6 +27,9 @@ #endif #include "nspr.h" +#ifdef XP_MAC +#include "pprio.h" // PR_Init_Log +#endif #define NSPIPE2 diff --git a/mozilla/nsprpub/pr/include/private/pprio.h b/mozilla/nsprpub/pr/include/private/pprio.h index 37877ea30d9..78d2cefbb3c 100644 --- a/mozilla/nsprpub/pr/include/private/pprio.h +++ b/mozilla/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___ */ diff --git a/mozilla/nsprpub/pr/include/prlog.h b/mozilla/nsprpub/pr/include/prlog.h index 19abcb96252..7e242c0c434 100644 --- a/mozilla/nsprpub/pr/include/prlog.h +++ b/mozilla/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. diff --git a/mozilla/xpfe/appshell/src/nsCommandLineServiceMac.cpp b/mozilla/xpfe/appshell/src/nsCommandLineServiceMac.cpp index d42434bf6b5..9c0db9953a2 100644 --- a/mozilla/xpfe/appshell/src/nsCommandLineServiceMac.cpp +++ b/mozilla/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 diff --git a/mozilla/xpfe/components/startup/src/nsCommandLineServiceMac.cpp b/mozilla/xpfe/components/startup/src/nsCommandLineServiceMac.cpp index d42434bf6b5..9c0db9953a2 100644 --- a/mozilla/xpfe/components/startup/src/nsCommandLineServiceMac.cpp +++ b/mozilla/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