Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-27 06:43:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

removing old NSPR20 #ifdef

Browse Source
This commit is contained in:
cyeh%netscape.com 1998-09-24 20:36:57 +00:00
parent bc86038f2a
commit bdcaa90d13
3 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/libfont/src/fb.cpp
View File

@ -47,11 +47,7 @@
#include "Mnfdoer.h"
#include "net.h" // libnet
#ifndef NSPR20
#include "prfile.h" // for reading directories
#else
#include "prio.h" // for reading directories
#endif /* NSPR20 */
FontBrokerObject::
FontBrokerObject() : fpPeers(NULL), fpPeersFromCatalog(NULL)
@ -533,11 +529,7 @@ int FontBrokerObject::scanDisplayersFromDir(const char *directoryName)
{
*nameptr++ = '/';
}
#ifndef NSPR20
while ((dp = PR_ReadDir(dir, PR_SKIP_DOT | PR_SKIP_DOT_DOT)) != NULL)
#else
while ((dp = PR_ReadDir(dir, PR_SKIP_BOTH)) != NULL)
#endif
{
strcpy(nameptr, PR_DirName(dp));
if (wf_isFileDirectory(filename))

6
modules/libfont/src/wfDlm.cpp
View File

@ -27,13 +27,11 @@
#include "wfDlm.h"
#include "libfont.h"
#ifdef NSPR20
#ifdef XP_MAC
#include "probslet.h"
#else
#include "obsolete/probslet.h"
#endif
#endif
wfDlm::wfDlm(const char *fname, const char *str)
: m_state(0), m_filename(NULL), m_lib(NULL), m_dlmInterface(NULL)
@ -248,11 +246,7 @@ FARPROC wfDlm::findSymbol(const char *symbol)
return (NULL);
}
#ifndef NSPR20
return PR_FindSymbol(symbol, m_lib);
#else
return (FARPROC)PR_FindSymbol(m_lib, symbol);
#endif /* NSPR20 */
}
int wfDlm::unload(int force)

2
modules/libfont/src/wfMisc.cpp
View File

@ -28,13 +28,11 @@
#include "wfMisc.h"
#include "Mnffmi.h"
#ifdef NSPR20
#ifdef XP_MAC
#include "probslet.h"
#else
#include "obsolete/probslet.h"
#endif
#endif
// The logic we are using to merge these is brute force.