Bug 792581 - part 3: Replace LL_NE macro with standard relation. r=ehsan
authorAndrew Quartey <andrew.quartey@gmail.com>
Wed, 03 Oct 2012 10:13:18 -0400
changeset 109062 ee5a3b45e378737cdc3bd2df00a13aff9f841acc
parent 109061 7aa4ea0c1d304fefdc6f0c68420ed77d11b66aa6
child 109063 bb806f6be5d0d995d910ecae9bb9690fa77d513a
push id15825
push userandrew.quartey@gmail.com
push dateWed, 03 Oct 2012 14:13:30 +0000
treeherdermozilla-inbound@066fea4aa285 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersehsan
bugs792581
milestone18.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 792581 - part 3: Replace LL_NE macro with standard relation. r=ehsan
content/base/src/nsDocument.cpp
dom/plugins/base/nsPluginHost.cpp
tools/trace-malloc/spacetrace.c
xpfe/components/directory/nsDirectoryViewer.cpp
--- a/content/base/src/nsDocument.cpp
+++ b/content/base/src/nsDocument.cpp
@@ -6884,17 +6884,17 @@ nsDocument::RetrieveRelevantHeaders(nsIC
   if (modDate == 0) {
     // We got nothing from our attempt to ask nsIFileChannel and
     // nsIHttpChannel for the last modified time. Return the current
     // time.
     modDate = PR_Now();
   }
 
   mLastModified.Truncate();
-  if (LL_NE(modDate, LL_ZERO)) {
+  if (modDate != LL_ZERO) {
     PRExplodedTime prtime;
     PR_ExplodeTime(modDate, PR_LocalTimeParameters, &prtime);
     // "MM/DD/YYYY hh:mm:ss"
     char formatedTime[24];
     if (PR_snprintf(formatedTime, sizeof(formatedTime),
                     "%02ld/%02ld/%04hd %02ld:%02ld:%02ld",
                     prtime.tm_month + 1, prtime.tm_mday, prtime.tm_year,
                     prtime.tm_hour     ,  prtime.tm_min,  prtime.tm_sec)) {
--- a/dom/plugins/base/nsPluginHost.cpp
+++ b/dom/plugins/base/nsPluginHost.cpp
@@ -2058,17 +2058,17 @@ nsresult nsPluginHost::ScanPluginsDirect
     nsRefPtr<nsPluginTag> pluginTag;
     RemoveCachedPluginsInfo(filePath.get(), getter_AddRefs(pluginTag));
 
     bool enabled = true;
     bool seenBefore = false;
     if (pluginTag) {
       seenBefore = true;
       // If plugin changed, delete cachedPluginTag and don't use cache
-      if (LL_NE(fileModTime, pluginTag->mLastModifiedTime)) {
+      if (fileModTime != pluginTag->mLastModifiedTime) {
         // Plugins has changed. Don't use cached plugin info.
         enabled = (pluginTag->Flags() & NS_PLUGIN_FLAG_ENABLED) != 0;
         pluginTag = nullptr;
 
         // plugin file changed, flag this fact
         *aPluginsChanged = true;
       }
 
--- a/tools/trace-malloc/spacetrace.c
+++ b/tools/trace-malloc/spacetrace.c
@@ -4522,17 +4522,17 @@ graphWeight(STRequest * inRequest, STRun
                 red = gdImageColorAllocate(graph, 255, 0, 0);
                 legendColors[0] = red;
 
                 drawGraph(graph, -1, "Allocation Weights", "Seconds",
                           "Weight", 11, percents, (const char **) timevals,
                           11, percents, (const char **) bytes, 1,
                           legendColors, legends);
 
-                if (LL_NE(maxWeight64, minWeight64)) {
+                if (maxWeight64 != minWeight64) {
                     int64_t in64 = LL_INIT(0, 0);
                     int64_t spacey64 = LL_INIT(0, 0);
                     int64_t weight64 = LL_INIT(0, 0);
                     int32_t in32 = 0;
 
                     /*
                      ** Go through our Y data and mark it up.
                      */
@@ -4998,17 +4998,17 @@ contextLookup(STOptions * inOptions)
     }
 #define ST_WEB_OPTION_STRING_PTR_ARRAY(option_name, option_genre, option_help)  /* no implementation */
 #define ST_WEB_OPTION_UINT32(option_name, option_genre, default_value, multiplier, option_help) \
     if(inOptions->m##option_name != inCache->mItems[loop].mOptions.m##option_name) \
     { \
         delta[(STOptionGenre)option_genre]++; \
     }
 #define ST_WEB_OPTION_UINT64(option_name, option_genre, default_value, multiplier, option_help) \
-    if(LL_NE(inOptions->m##option_name##64, inCache->mItems[loop].mOptions.m##option_name##64)) \
+    if(inOptions->m##option_name##64 != inCache->mItems[loop].mOptions.m##option_name##64) \
     { \
         delta[(STOptionGenre)option_genre]++; \
     }
 #include "stoptions.h"
                     /*
                      **  If there is no genre out of alignment, we accept this as the context.
                      */
                     if (0 == delta[CategoryGenre] &&
--- a/xpfe/components/directory/nsDirectoryViewer.cpp
+++ b/xpfe/components/directory/nsDirectoryViewer.cpp
@@ -430,17 +430,17 @@ nsHTTPIndex::OnIndexAvailable(nsIRequest
       rv = Assert(entry, kNC_Description, lit, true);
       if (NS_FAILED(rv)) return rv;
       
       // contentlength
       int64_t size;
       rv = aIndex->GetSize(&size);
       if (NS_FAILED(rv)) return rv;
       int64_t minus1 = UINT64_MAX;
-      if (LL_NE(size, minus1)) {
+      if (size != minus1) {
         int32_t intSize;
         LL_L2I(intSize, size);
         // XXX RDF should support 64 bit integers (bug 240160)
         nsCOMPtr<nsIRDFInt> val;
         rv = mDirRDF->GetIntLiteral(intSize, getter_AddRefs(val));
         if (NS_FAILED(rv)) return rv;
         rv = Assert(entry, kNC_ContentLength, val, true);
         if (NS_FAILED(rv)) return rv;