[X2Go-Commits] [pale-moon] 260/294: Remove some BEOS 1st party code leftovers.

git-admin at x2go.org git-admin at x2go.org
Sat Apr 27 08:58:26 CEST 2019


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch upstream/28.5.0
in repository pale-moon.

commit 095ea556855b38138e39e713f482eb440f7da9b2
Author: wolfbeast <mcwerewolf at wolfbeast.com>
Date:   Sun Apr 14 15:47:58 2019 +0200

    Remove some BEOS 1st party code leftovers.
---
 modules/libpref/Preferences.cpp | 2 --
 netwerk/base/nsFileStreams.cpp  | 6 +++---
 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 c56cad9..1948770 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 6508b33..5a82dea 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 26e432b..4ae70fd 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"

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git


More information about the x2go-commits mailing list