Merge pull request 'Nuke remaining dbsoft contributions' (%3000) from nuke-removal-work into master

Reviewed-on: https://repo.palemoon.org/MoonchildProductions/GRE/pulls/3000

6 files changed, 0 insertions, 82 deletions

diff --git a/memory/mozjemalloc/jemalloc.c b/memory/mozjemalloc/jemalloc.c
index 5b8a6c326..02e771a09 100644
--- a/memory/mozjemalloc/jemalloc.c
+++ b/memory/mozjemalloc/jemalloc.c
@@ -294,22 +294,9 @@ typedef long ssize_t;
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#ifndef MOZ_MEMORY_DARWIN
 #include <strings.h>
-#endif
 #include <unistd.h>
 
-#ifdef MOZ_MEMORY_DARWIN
-#include <libkern/OSAtomic.h>
-#include <mach/mach_error.h>
-#include <mach/mach_init.h>
-#include <mach/vm_map.h>
-#include <malloc/malloc.h>
-#ifndef _pthread_self
-#define _pthread_self() pthread_self()
-#endif
-#endif
-
 #endif
 
 #include "jemalloc_types.h"
diff --git a/netwerk/protocol/http/nsHttpHandler.cpp b/netwerk/protocol/http/nsHttpHandler.cpp
index 42c7b1a8f..5dde6df71 100644
--- a/netwerk/protocol/http/nsHttpHandler.cpp
+++ b/netwerk/protocol/http/nsHttpHandler.cpp
@@ -828,15 +828,6 @@ nsHttpHandler::InitUserAgentComponents()
             PR_smprintf_free(buf);
         }
     }
-#elif defined (XP_MACOSX)
-#if defined(__ppc__)
-    mOscpu.AssignLiteral("PPC Mac OS X");
-#elif defined(__i386__) || defined(__x86_64__)
-    mOscpu.AssignLiteral("Intel Mac OS X");
-#endif
-    SInt32 majorVersion = nsCocoaFeatures::macOSVersionMajor();
-    SInt32 minorVersion = nsCocoaFeatures::macOSVersionMinor();
-    mOscpu += nsPrintfCString(" %d.%d", majorVersion, minorVersion);
 #elif defined (XP_UNIX)
     struct utsname name;
 
diff --git a/nsprpub/pr/src/linking/prlink.c b/nsprpub/pr/src/linking/prlink.c
index 1f3430714..ed4a822f8 100644
--- a/nsprpub/pr/src/linking/prlink.c
+++ b/nsprpub/pr/src/linking/prlink.c
@@ -7,11 +7,6 @@
 
 #include <string.h>
 
-#if defined(XP_MACOSX) && defined(USE_MACH_DYLD)
-#include <Carbon/Carbon.h>
-#include <CoreFoundation/CoreFoundation.h>
-#endif
-
 #ifdef XP_UNIX
 #ifdef USE_DLFCN
 #include <dlfcn.h>
@@ -789,17 +784,7 @@ pr_LoadLibraryByPathname(const char *name, PRIntn flags)
         if (flags & PR_LD_LOCAL) {
             dl_flags |= RTLD_LOCAL;
         }
-#if defined(DARWIN)
-        /* ensure the file exists if it contains a slash character i.e. path */
-        /* DARWIN's dlopen ignores the provided path and checks for the */
-        /* plain filename in DYLD_LIBRARY_PATH */
-        if (strchr(name, PR_DIRECTORY_SEPARATOR) == NULL ||
-            PR_Access(name, PR_ACCESS_EXISTS) == PR_SUCCESS) {
-            h = dlopen(name, dl_flags);
-        }
-#else
         h = dlopen(name, dl_flags);
-#endif
 #elif defined(USE_HPSHL)
         int shl_flags = 0;
         shl_t h;
diff --git a/widget/GfxDriverInfo.h b/widget/GfxDriverInfo.h
index 17baf136d..ad4337b0f 100644
--- a/widget/GfxDriverInfo.h
+++ b/widget/GfxDriverInfo.h
@@ -49,21 +49,6 @@ enum class OperatingSystem {
   Windows8_1,
   Windows10,
   Linux,
-  OSX,
-  OSX10_5,
-  OSX10_6,
-  OSX10_7,
-  OSX10_8,
-  OSX10_9,
-  OSX10_10,
-  OSX10_11,
-  OSX10_12,
-  OSX10_13,
-  OSX10_14,
-  OSX10_15,
-  OSX10_16,
-  OSX11_0,
-  Ios
 };
 
 enum VersionComparisonOp {
diff --git a/widget/GfxInfoBase.cpp b/widget/GfxInfoBase.cpp
index ae0878c75..d68cfc07f 100644
--- a/widget/GfxInfoBase.cpp
+++ b/widget/GfxInfoBase.cpp
@@ -257,30 +257,6 @@ BlacklistOSToOperatingSystem(const nsAString& os)
     return OperatingSystem::Windows10;
   else if (os.EqualsLiteral("Linux"))
     return OperatingSystem::Linux;
-  else if (os.EqualsLiteral("Darwin 9"))
-    return OperatingSystem::OSX10_5;
-  else if (os.EqualsLiteral("Darwin 10"))
-    return OperatingSystem::OSX10_6;
-  else if (os.EqualsLiteral("Darwin 11"))
-    return OperatingSystem::OSX10_7;
-  else if (os.EqualsLiteral("Darwin 12"))
-    return OperatingSystem::OSX10_8;
-  else if (os.EqualsLiteral("Darwin 13"))
-    return OperatingSystem::OSX10_9;
-  else if (os.EqualsLiteral("Darwin 14"))
-    return OperatingSystem::OSX10_10;
-  else if (os.EqualsLiteral("Darwin 15"))
-    return OperatingSystem::OSX10_11;
-  else if (os.EqualsLiteral("Darwin 16"))
-    return OperatingSystem::OSX10_12;
-  else if (os.EqualsLiteral("Darwin 17"))
-    return OperatingSystem::OSX10_13;
-  else if (os.EqualsLiteral("Darwin 18"))
-    return OperatingSystem::OSX10_14;
-  else if (os.EqualsLiteral("Darwin 19"))
-    return OperatingSystem::OSX10_15;
-  else if (os.EqualsLiteral("Darwin 20"))
-    return OperatingSystem::OSX11_0;
   // For historical reasons, "All" in blocklist means "All Windows"
   else if (os.EqualsLiteral("All"))
     return OperatingSystem::Windows;
diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestParser.cpp
index f25635428..e3b0b0f3c 100644
--- a/xpcom/components/ManifestParser.cpp
+++ b/xpcom/components/ManifestParser.cpp
@@ -539,12 +539,6 @@ ParseManifest(NSLocationType aType, FileLocation& aFile, char* aBuf,
                               info.dwMinorVersion);
   }
 #pragma warning(pop)
-#elif defined(MOZ_WIDGET_COCOA)
-  SInt32 majorVersion = nsCocoaFeatures::macOSVersionMajor();
-  SInt32 minorVersion = nsCocoaFeatures::macOSVersionMinor();
-  nsTextFormatter::ssprintf(osVersion, u"%ld.%ld",
-                            majorVersion,
-                            minorVersion);
 #elif defined(MOZ_WIDGET_GTK)
   nsTextFormatter::ssprintf(osVersion, u"%ld.%ld",
                             gtk_major_version,