Bug 1732194 - Fix non-unified build error in image/. r=tnikkel
authorChris Peterson <cpeterson@mozilla.com>
Thu, 23 Sep 2021 02:54:14 +0000
changeset 593006 c7ea3f63682a9bc663272bbe32988f4f0ffb15ce
parent 593001 fd22d1129050be341b65bcada329bc2603538abb
child 593007 bda89b20f8aea7c6846cf3b154a8d552891d559a
push id38820
push usersmolnar@mozilla.com
push dateThu, 23 Sep 2021 21:45:25 +0000
treeherdermozilla-central@4eda9eb8926b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstnikkel
bugs1732194, 1583044, 1589337
milestone94.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 1732194 - Fix non-unified build error in image/. r=tnikkel Building with `ac_add_options --disable-unified-build` on macOS hits the following -Wunused-const-variable warning-as-error: image/decoders/icon/nsIconURI.cpp:39:22 [-Wunused-const-variable] unused variable 'kIconURICID'. `kIconURICID` was added in bug 1583044. The only use of `kIconURICID` was later removed in bug 1589337, leaving `kIconURICID` still defined but unused. Differential Revision: https://phabricator.services.mozilla.com/D126419
image/decoders/icon/nsIconURI.cpp
--- a/image/decoders/icon/nsIconURI.cpp
+++ b/image/decoders/icon/nsIconURI.cpp
@@ -31,17 +31,16 @@ using namespace mozilla::ipc;
 #elif defined(PATH_MAX)
 #  define SANE_FILE_NAME_LEN PATH_MAX
 #else
 #  define SANE_FILE_NAME_LEN 1024
 #endif
 
 static NS_DEFINE_CID(kThisIconURIImplementationCID,
                      NS_THIS_ICONURI_IMPLEMENTATION_CID);
-static NS_DEFINE_CID(kIconURICID, NS_ICONURI_CID);
 
 // helper function for parsing out attributes like size, and contentType
 // from the icon url.
 static void extractAttributeValue(const char* aSearchString,
                                   const char* aAttributeName,
                                   nsCString& aResult);
 
 static const char* kSizeStrings[] = {"button", "toolbar", "toolbarsmall",