Bug 659229 - Remove MOZ_ENABLE_LIBXUL checks in GfxInfoX11.cpp r=ted,Callek a=mak
authorMatheus Kerschbaum <matjk7@gmail.com>
Tue, 24 May 2011 07:29:46 -0500
changeset 70090 ead02eda01476e46b6be36ea5c2b004f9aeebd8b
parent 70089 0acfb7c8331bfe4fd30501cbd3ec911de18c8c97
child 70091 26440e8180a2fcec60a0485b8d86cb0763d3d7f0
push id20180
push userjmathies@mozilla.com
push dateTue, 24 May 2011 12:36:15 +0000
treeherdermozilla-central@26440e8180a2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted, Callek, mak
bugs659229
milestone6.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 659229 - Remove MOZ_ENABLE_LIBXUL checks in GfxInfoX11.cpp r=ted,Callek a=mak
widget/src/xpwidgets/GfxInfoX11.cpp
--- a/widget/src/xpwidgets/GfxInfoX11.cpp
+++ b/widget/src/xpwidgets/GfxInfoX11.cpp
@@ -41,17 +41,17 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <errno.h>
 #include "nsCRTGlue.h"
 #include "prenv.h"
 
 #include "GfxInfoX11.h"
 
-#if defined(MOZ_CRASHREPORTER) && defined(MOZ_ENABLE_LIBXUL)
+#ifdef MOZ_CRASHREPORTER
 #include "nsExceptionHandler.h"
 #include "nsICrashReporter.h"
 #endif
 
 namespace mozilla {
 namespace widget {
 
 // these global variables will be set when firing the glxtest process
@@ -160,33 +160,33 @@ GfxInfo::GetData()
             mAdapterDescription.AppendPrintf(" (exited with status %d)", WEXITSTATUS(glxtest_status));
         if (received_signal)
             mAdapterDescription.AppendPrintf(" (received signal %d)", WTERMSIG(glxtest_status));
         if (bytesread) {
             mAdapterDescription.AppendLiteral(": ");
             mAdapterDescription.Append(nsDependentCString(buf));
             mAdapterDescription.AppendLiteral("\n");
         }
-#if defined(MOZ_CRASHREPORTER) && defined(MOZ_ENABLE_LIBXUL)
+#ifdef MOZ_CRASHREPORTER
         CrashReporter::AppendAppNotesToCrashReport(mAdapterDescription);
 #endif
         return;
     }
 
     mAdapterDescription.Append(mVendor);
     mAdapterDescription.AppendLiteral(" -- ");
     mAdapterDescription.Append(mRenderer);
 
     nsCAutoString note;
     note.Append("OpenGL: ");
     note.Append(mAdapterDescription);
     note.Append(" -- ");
     note.Append(mVersion);
     note.Append("\n");
-#if defined(MOZ_CRASHREPORTER) && defined(MOZ_ENABLE_LIBXUL)
+#ifdef MOZ_CRASHREPORTER
     CrashReporter::AppendAppNotesToCrashReport(note);
 #endif
 
     // determine driver type (vendor) and where in the version string
     // the actual driver version numbers should be expected to be found (whereToReadVersionNumbers)
     const char *whereToReadVersionNumbers = nsnull;
     const char *Mesa_in_version_string = strstr(mVersion.get(), "Mesa");
     if (Mesa_in_version_string) {