Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-29 07:42:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove old NSPR20 #ifdefs

Browse Source
This commit is contained in:
cyeh%netscape.com 1998-09-28 20:45:35 +00:00
parent db3c059500
commit 8ab8bed7e3
3 changed files with 3 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lib/xp/xp_file.c
View File

@ -21,13 +21,11 @@
#include "plstr.h"
#include "prmon.h"
#ifdef NSPR20
#ifdef XP_MAC
#include "prpriv.h"
#else
#include "private/prpriv.h"
#endif
#endif
#ifdef XP_UNIX
#include <fcntl.h>
@ -1476,14 +1474,12 @@ XP_GetNewsRCFiles(void)
continue;
strncpy (host, suffix + 1, port - suffix - 1);
host [port - suffix - 1] = 0;
#ifndef NSPR20
ok = PR_gethostbyname (host, &hpbuf, dbbuf, sizeof(dbbuf), 0);
#else
if (PR_GetHostByName (host, dbbuf, sizeof(dbbuf), &hpbuf) == PR_SUCCESS)
if (PR_GetHostByName (host, dbbuf, sizeof(dbbuf), &hpbuf) == PR_SUCCESS)
ok = &hpbuf;
else
ok = NULL;
#endif
if (!ok)
continue;
}
@ -1628,11 +1624,7 @@ XP_Bool XP_FileIsFullPath(const char * name)
#if !defined(XP_WIN) && !defined(XP_OS2)
#ifdef NSPR
#ifndef NSPR20
extern PRMonitor* _pr_TempName_lock;
#else
PRMonitor* _pr_TempName_lock = NULL;
#endif /* NSPR20 */
#endif
PUBLIC char *
@ -1642,15 +1634,10 @@ WH_FileName (const char *name, XP_FileType type)
static char configBuf [1024]; /* protected by _pr_TempName_lock */
char* result;
#ifdef NSPR
#ifndef NSPR20
XP_ASSERT(_pr_TempName_lock);
PR_EnterMonitor(_pr_TempName_lock);
#else
if (_pr_TempName_lock == NULL) {
_pr_TempName_lock = PR_NewNamedMonitor("TempName-lock");
}
PR_EnterMonitor(_pr_TempName_lock);
#endif /* NSPR20 */
#endif
/* reset
*/
@ -1670,15 +1657,10 @@ WH_FilePlatformName(const char * name)
char* result;
static char path[300]; /* Names longer than 300 are not dealt with in our stdio */
#ifdef NSPR
#ifndef NSPR20
XP_ASSERT(_pr_TempName_lock);
PR_EnterMonitor(_pr_TempName_lock);
#else
if (_pr_TempName_lock == NULL) {
_pr_TempName_lock = PR_NewNamedMonitor("TempName-lock");
}
PR_EnterMonitor(_pr_TempName_lock);
#endif /* NSPR20 */
#endif
result = xp_FilePlatformName(name, path);
#ifdef NSPR
@ -1699,15 +1681,10 @@ WH_TempName(XP_FileType type, const char * prefix)
static unsigned int count = 0;
char* result;
#ifdef NSPR
#ifndef NSPR20
XP_ASSERT(_pr_TempName_lock);
PR_EnterMonitor(_pr_TempName_lock);
#else
if (_pr_TempName_lock == NULL) {
_pr_TempName_lock = PR_NewNamedMonitor("TempName-lock");
}
PR_EnterMonitor(_pr_TempName_lock);
#endif /* NSPR20 */
#endif
result = xp_TempName(type, prefix, buf, buf2, &count);
if (result)

5
lib/xp/xp_trace.c
View File

@ -23,11 +23,6 @@
#include "xp_trace.h"
#include "xp_mcom.h"
#ifndef NSPR20
#if defined(__sun)
#include "sunos4.h"
#endif
#endif /* NSPR20 */
void XP_TraceV (const char* message, va_list args)
{

4
lib/xp/xp_tracker.c
View File

@ -32,10 +32,6 @@
#include <stdio.h>
#include <string.h>
#ifndef NSPR20
#include "prglobal.h"
#include "prfile.h"
#endif
#include "xp_tracker.h"