Redundant code path cleanup (#1702)

Remove various obsolete configure options.
Remove Adjust SDK install tracking filth.
Remove redundant code paths in old-configure
This also optimizes linker use
Remove redundant conditional blocks.
Rewrite span.h without constexpr use.

3 files changed, 0 insertions, 46 deletions

diff --git a/toolkit/content/license.html b/toolkit/content/license.html
index 1041ec42f..d97a3c7f1 100644
--- a/toolkit/content/license.html
+++ b/toolkit/content/license.html
@@ -67,9 +67,6 @@
       </li>
       <li><a href="about:license#ACE">ACE License</a></li>
       <li><a href="about:license#acorn">acorn License</a></li>
-#ifdef MOZ_INSTALL_TRACKING
-      <li><a href="about:license#adjust">Adjust SDK License</a></li>
-#endif
       <li><a href="about:license#adobecmap">Adobe CMap License</a></li>
       <li><a href="about:license#android">Android Open Source License</a></li>
       <li><a href="about:license#angle">ANGLE License</a></li>
@@ -2233,39 +2230,6 @@ licences.
 
     <hr>
 
-#ifdef MOZ_INSTALL_TRACKING
-    <h1><a id="adjust"></a>Adjust SDK License</h1>
-
-    <p>This license applies to all files in the directory
-    <span class="path">mobile/android/thirdparty/com/adjust/sdk</span>.</p>
-
-<pre>
-Copyright (c) 2012-2014 adjust GmbH,
-http://www.adjust.com
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-</pre>
-
-    <hr>
-
-#endif
     <h1><a id="apache"></a>Apache License 2.0</h1>
 
     <p>This license applies to various files in the Mozilla codebase.</p>
diff --git a/toolkit/modules/AppConstants.jsm b/toolkit/modules/AppConstants.jsm
index 5eea04b0f..889a38b93 100644
--- a/toolkit/modules/AppConstants.jsm
+++ b/toolkit/modules/AppConstants.jsm
@@ -180,13 +180,6 @@ MOZ_SAFE_BROWSING:
   false,
 #endif
 
-  MOZ_GRAPHENE:
-#ifdef MOZ_GRAPHENE
-  true,
-#else
-  false,
-#endif
-
   MOZ_PLACES:
 #ifdef MOZ_PLACES
   true,
diff --git a/toolkit/mozapps/update/common/updatedefines.h b/toolkit/mozapps/update/common/updatedefines.h
index 871755246..49fbde6f2 100644
--- a/toolkit/mozapps/update/common/updatedefines.h
+++ b/toolkit/mozapps/update/common/updatedefines.h
@@ -44,9 +44,6 @@
 # define access _access
 
 # define putenv _putenv
-# if defined(_MSC_VER) && _MSC_VER < 1900
-#  define stat _stat
-# endif
 # define DELETE_DIR L"tobedeleted"
 # define CALLBACK_BACKUP_EXT L".moz-callback"