зеркало из https://github.com/mozilla/gecko-dev.git
ooops. backout previous change to remove NSRP defines. It's defined
everywhere on UNIX, Mac, and Win32 backend, but not the WinFE. Try again later.
This commit is contained in:
Родитель
bef014ff03
Коммит
0f4888c65b
|
@ -775,10 +775,14 @@ WH_TempFileName(int type, const char * request_prefix, const char * extension)
|
|||
{
|
||||
static char file_buf[_MAX_PATH]; /* protected by _pr_TempName_lock */
|
||||
char* result;
|
||||
#ifdef NSPR
|
||||
XP_ASSERT(_pr_TempName_lock);
|
||||
PR_EnterMonitor(_pr_TempName_lock);
|
||||
#endif
|
||||
result = XP_STRDUP(xp_TempFileName(type, request_prefix, extension, file_buf));
|
||||
#ifdef NSPR
|
||||
PR_ExitMonitor(_pr_TempName_lock);
|
||||
#endif
|
||||
return result;
|
||||
}
|
||||
|
||||
|
@ -3740,10 +3744,14 @@ WH_TempName(XP_FileType type, const char * prefix)
|
|||
{
|
||||
static char buf[_MAX_PATH]; /* protected by _pr_TempName_lock */
|
||||
char* result;
|
||||
#ifdef NSPR
|
||||
XP_ASSERT(_pr_TempName_lock);
|
||||
PR_EnterMonitor(_pr_TempName_lock);
|
||||
#endif
|
||||
result = XP_STRDUP(xp_TempFileName(type, prefix, NULL, buf));
|
||||
#ifdef NSPR
|
||||
PR_ExitMonitor(_pr_TempName_lock);
|
||||
#endif
|
||||
return result;
|
||||
}
|
||||
|
||||
|
@ -3757,10 +3765,14 @@ WH_FileName (const char *name, XP_FileType type)
|
|||
** I'm not sure this lock is really needed by windows, but just
|
||||
** to be safe:
|
||||
*/
|
||||
#ifdef NSPR
|
||||
// XP_ASSERT(_pr_TempName_lock);
|
||||
// PR_EnterMonitor(_pr_TempName_lock);
|
||||
#endif
|
||||
result = xp_FileName(name, type, &myName);
|
||||
#ifdef NSPR
|
||||
// PR_ExitMonitor(_pr_TempName_lock);
|
||||
#endif
|
||||
return myName;
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче