diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2020-02-22 19:03:00 -0500 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-14 12:51:25 +0200 |
| commit | da15aa0fdf5ec769a0973a00d84f9fa090de0b60 (patch) | |
| tree | c6f5b8197eac51be855aecdae3b5d97207cdf97e /xpcom/glue/FileUtils.cpp | |
| parent | 867737dd4b650494404a90b8b99ea959f74462ca (diff) | |
| download | UXP-da15aa0fdf5ec769a0973a00d84f9fa090de0b60.tar UXP-da15aa0fdf5ec769a0973a00d84f9fa090de0b60.tar.gz UXP-da15aa0fdf5ec769a0973a00d84f9fa090de0b60.tar.lz UXP-da15aa0fdf5ec769a0973a00d84f9fa090de0b60.tar.xz UXP-da15aa0fdf5ec769a0973a00d84f9fa090de0b60.zip | |
Issue #1053 - Remove android support from XPCOM
Diffstat (limited to 'xpcom/glue/FileUtils.cpp')
| -rw-r--r-- | xpcom/glue/FileUtils.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/xpcom/glue/FileUtils.cpp b/xpcom/glue/FileUtils.cpp index 53fe68708..65a6c1e82 100644 --- a/xpcom/glue/FileUtils.cpp +++ b/xpcom/glue/FileUtils.cpp @@ -226,7 +226,7 @@ mozilla::ReadAheadLib(nsIFile* aFile) return; } ReadAheadLib(path.get()); -#elif defined(LINUX) && !defined(ANDROID) || defined(XP_MACOSX) +#elif defined(LINUX) || defined(XP_MACOSX) nsAutoCString nativePath; if (!aFile || NS_FAILED(aFile->GetNativePath(nativePath))) { return; @@ -245,7 +245,7 @@ mozilla::ReadAheadFile(nsIFile* aFile, const size_t aOffset, return; } ReadAheadFile(path.get(), aOffset, aCount, aOutFd); -#elif defined(LINUX) && !defined(ANDROID) || defined(XP_MACOSX) +#elif defined(LINUX) || defined(XP_MACOSX) nsAutoCString nativePath; if (!aFile || NS_FAILED(aFile->GetNativePath(nativePath))) { return; @@ -256,7 +256,7 @@ mozilla::ReadAheadFile(nsIFile* aFile, const size_t aOffset, #endif // !defined(XPCOM_GLUE) -#if defined(LINUX) && !defined(ANDROID) +#if defined(LINUX) static const unsigned int bufsize = 4096; @@ -382,7 +382,7 @@ mozilla::ReadAhead(mozilla::filedesc_t aFd, const size_t aOffset, // Restore the file pointer SetFilePointerEx(aFd, fpOriginal, nullptr, FILE_BEGIN); -#elif defined(LINUX) && !defined(ANDROID) +#elif defined(LINUX) readahead(aFd, aOffset, aCount); @@ -405,7 +405,7 @@ mozilla::ReadAheadLib(mozilla::pathstr_t aFilePath) } #if defined(XP_WIN) ReadAheadFile(aFilePath); -#elif defined(LINUX) && !defined(ANDROID) +#elif defined(LINUX) int fd = open(aFilePath, O_RDONLY); if (fd < 0) { return; @@ -532,7 +532,7 @@ mozilla::ReadAheadFile(mozilla::pathstr_t aFilePath, const size_t aOffset, if (!aOutFd) { CloseHandle(fd); } -#elif defined(LINUX) && !defined(ANDROID) || defined(XP_MACOSX) || defined(XP_SOLARIS) +#elif defined(LINUX) || defined(XP_MACOSX) || defined(XP_SOLARIS) if (!aFilePath) { if (aOutFd) { *aOutFd = -1; |