Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

# 37239

Browse Source 
r = dougt, a = brendan
OS/2 bringup continues on M16 - #ifdefs for OS/2 only


git-svn-id: svn://10.0.0.236/trunk@70840 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mkaply%us.ibm.com 2000-05-25 14:26:34 +00:00
parent 83c30253b0
commit 2fa3265dbe
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mozilla/xpcom/io/nsDirectoryService.cpp
View File

@ -250,7 +250,7 @@ nsIAtom* nsDirectoryService::sFontsDirectory = nsnull;
nsIAtom* nsDirectoryService::sPreferencesDirectory = nsnull;
nsIAtom* nsDirectoryService::sDocumentsDirectory = nsnull;
nsIAtom* nsDirectoryService::sInternetSearchDirectory = nsnull;
#elif defined (XP_PC)
#elif defined (XP_PC) && !defined(XP_OS2)
nsIAtom* nsDirectoryService::sSystemDirectory = nsnull;
nsIAtom* nsDirectoryService::sWindowsDirectory = nsnull;
nsIAtom* nsDirectoryService::sHomeDirectory = nsnull;
@ -356,7 +356,7 @@ nsDirectoryService::Init()
nsDirectoryService::sPreferencesDirectory = NS_NewAtom("system.PreferencesDirectory");
nsDirectoryService::sDocumentsDirectory = NS_NewAtom("system.DocumentsDirectory");
nsDirectoryService::sInternetSearchDirectory = NS_NewAtom("system.InternetSearchDirectory");
#elif defined (XP_PC)
#elif defined (XP_PC) && !defined(XP_OS2)
nsDirectoryService::sSystemDirectory = NS_NewAtom("system.SystemDirectory");
nsDirectoryService::sWindowsDirectory = NS_NewAtom("system.WindowsDirectory");
nsDirectoryService::sHomeDirectory = NS_NewAtom("system.HomeDirectory");
@ -446,7 +446,7 @@ nsDirectoryService::~nsDirectoryService()
NS_IF_RELEASE(nsDirectoryService::sPreferencesDirectory);
NS_IF_RELEASE(nsDirectoryService::sDocumentsDirectory);
NS_IF_RELEASE(nsDirectoryService::sInternetSearchDirectory);
#elif defined (XP_PC)
#elif defined (XP_PC) && !defined(XP_OS2)
NS_IF_RELEASE(nsDirectoryService::sSystemDirectory);
NS_IF_RELEASE(nsDirectoryService::sWindowsDirectory);
NS_IF_RELEASE(nsDirectoryService::sHomeDirectory);
@ -749,7 +749,7 @@ nsDirectoryService::GetFile(const char *prop, PRBool *persistant, nsIFile **_ret
nsSpecialSystemDirectory fileSpec(nsSpecialSystemDirectory::Mac_InternetSearchDirectory);
rv = NS_FileSpecToIFile(&fileSpec, getter_AddRefs(localFile));
}
#elif defined (XP_PC)
#elif defined (XP_PC) && !defined(XP_OS2)
else if (inAtom == nsDirectoryService::sSystemDirectory)
{
nsSpecialSystemDirectory fileSpec(nsSpecialSystemDirectory::Win_SystemDirectory);

4
mozilla/xpcom/io/nsLocalFileCommon.cpp
View File

@ -33,8 +33,12 @@
#include "nsFileSpec.h"
#ifdef XP_PC
#ifdef XP_OS2
#include "nsLocalFileOS2.h"
#else
#include "nsLocalFileWin.h"
#endif
#endif
#ifdef XP_MAC
#include "nsLocalFileMac.h"