diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2019-04-16 06:59:00 -0400 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2019-04-16 06:59:00 -0400 |
| commit | dea59474457c7c62009aa11e41f3a56e9f30f62a (patch) | |
| tree | b1604728b6048b2964517a7a36144c712990480a | |
| parent | 0ea4dabdeaa5e3f198bece363fa45c032b9f3cb7 (diff) | |
| parent | 095ea556855b38138e39e713f482eb440f7da9b2 (diff) | |
| download | UXP-dea59474457c7c62009aa11e41f3a56e9f30f62a.tar UXP-dea59474457c7c62009aa11e41f3a56e9f30f62a.tar.gz UXP-dea59474457c7c62009aa11e41f3a56e9f30f62a.tar.lz UXP-dea59474457c7c62009aa11e41f3a56e9f30f62a.tar.xz UXP-dea59474457c7c62009aa11e41f3a56e9f30f62a.zip | |
Merge branch 'master' into Sync-weave
| -rw-r--r-- | modules/libpref/Preferences.cpp | 2 | ||||
| -rw-r--r-- | netwerk/base/nsFileStreams.cpp | 6 | ||||
| -rw-r--r-- | toolkit/xre/nsAppRunner.cpp | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp index c56cad98d..19487704f 100644 --- a/modules/libpref/Preferences.cpp +++ b/modules/libpref/Preferences.cpp @@ -1306,8 +1306,6 @@ static nsresult pref_InitInitialObjects() "winpref.js" #elif defined(XP_UNIX) "unix.js" -#elif defined(XP_BEOS) - "beos.js" #endif }; diff --git a/netwerk/base/nsFileStreams.cpp b/netwerk/base/nsFileStreams.cpp index 6508b33b9..5a82dea1b 100644 --- a/netwerk/base/nsFileStreams.cpp +++ b/netwerk/base/nsFileStreams.cpp @@ -5,7 +5,7 @@ #include "ipc/IPCMessageUtils.h" -#if defined(XP_UNIX) || defined(XP_BEOS) +#if defined(XP_UNIX) #include <unistd.h> #elif defined(XP_WIN) #include <windows.h> @@ -97,14 +97,14 @@ nsFileStreamBase::SetEOF() if (mFD == nullptr) return NS_BASE_STREAM_CLOSED; -#if defined(XP_UNIX) || defined(XP_BEOS) +#if defined(XP_UNIX) // Some system calls require an EOF offset. int64_t offset; rv = Tell(&offset); if (NS_FAILED(rv)) return rv; #endif -#if defined(XP_UNIX) || defined(XP_BEOS) +#if defined(XP_UNIX) if (ftruncate(PR_FileDesc2NativeHandle(mFD), offset) != 0) { NS_ERROR("ftruncate failed"); return NS_ERROR_FAILURE; diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp index 26e432b3c..4ae70fd43 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp @@ -2462,7 +2462,7 @@ RemoveComponentRegistries(nsIFile* aProfileDir, nsIFile* aLocalProfileDir, if (!file) return false; -#if defined(XP_UNIX) || defined(XP_BEOS) +#if defined(XP_UNIX) #define PLATFORM_FASL_SUFFIX ".mfasl" #elif defined(XP_WIN) #define PLATFORM_FASL_SUFFIX ".mfl" |