Bug 1176703 - attempt to fix define issues with some compilers/envs, rs=me, CLOSED TREE, bustage
authorGijs Kruitbosch <gijskruitbosch@gmail.com>
Fri, 10 Jul 2015 17:12:54 +0100
changeset 252276 5995a3f88211143645534f920e5f31e654748140
parent 252275 ce43b449ebe7288be16982fbff603a23c133589d
child 252277 d8df07a11ff7310af83c2e1120da8c0f147ff930
child 252359 eefff310415b0e0b5b86bb521f4adf9f2aea80b3
push id29030
push userkwierso@gmail.com
push dateFri, 10 Jul 2015 21:38:51 +0000
treeherdermozilla-central@d8df07a11ff7 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme, CLOSED
bugs1176703
milestone42.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1176703 - attempt to fix define issues with some compilers/envs, rs=me, CLOSED TREE, bustage
toolkit/xre/moz.build
toolkit/xre/nsXREDirProvider.cpp
--- a/toolkit/xre/moz.build
+++ b/toolkit/xre/moz.build
@@ -143,16 +143,19 @@ if CONFIG['OS_ARCH'] == 'Linux' and 'lib
 DEFINES['GRE_MILESTONE'] = CONFIG['GRE_MILESTONE']
 
 for var in ('APP_VERSION', 'APP_ID'):
     DEFINES[var] = CONFIG['MOZ_%s' % var]
 
 if CONFIG['MOZILLA_OFFICIAL']:
     DEFINES['MOZILLA_OFFICIAL'] = True
 
+if CONFIG['MOZ_BUILD_APP'] == 'browser':
+    DEFINES['MOZ_BUILD_APP_IS_BROWSER'] = True
+
 LOCAL_INCLUDES += [
     '../profile',
     '/config',
     '/dom/base',
     '/dom/ipc',
     '/testing/gtest/mozilla',
     '/toolkit/crashreporter',
     '/xpcom/build',
--- a/toolkit/xre/nsXREDirProvider.cpp
+++ b/toolkit/xre/nsXREDirProvider.cpp
@@ -639,17 +639,17 @@ nsXREDirProvider::LoadExtensionBundleDir
       if (NS_FAILED(rv))
         return;
 
       RegisterExtensionInterpositions(parser);
       LoadExtensionDirectories(parser, "ExtensionDirs", mExtensionDirectories,
                                NS_EXTENSION_LOCATION);
       LoadExtensionDirectories(parser, "ThemeDirs", mThemeDirectories,
                                NS_SKIN_LOCATION);
-#if MOZ_BUILD_APP == browser
+#ifdef MOZ_BUILD_APP_IS_BROWSER
     } else {
       // In safe mode, still load the default theme directory:
       nsCOMPtr<nsIFile> themeManifest;
       mXULAppDir->Clone(getter_AddRefs(themeManifest));
       themeManifest->AppendNative(NS_LITERAL_CSTRING("extensions"));
       themeManifest->AppendNative(NS_LITERAL_CSTRING("{972ce4c6-7e08-4474-a285-3208198ce6fd}"));
       themeManifest->AppendNative(NS_LITERAL_CSTRING("chrome.manifest"));
       XRE_AddManifestLocation(NS_SKIN_LOCATION, themeManifest);