Bug 1026986 Allow to build InstallX11ErrorHandler() at building Qt-build r=karlt
authorMasayuki Nakano <masayuki@d-toybox.com>
Fri, 20 Jun 2014 14:41:32 +0900
changeset 189746 55620c684232c453e299d64a4e2d3103c2f0f858
parent 189745 80a5c49abbc647066b46c9bbb3cebff0420218e8
child 189747 c6d2e1d54476790943b5d65c89466c3a0338ac19
push idunknown
push userunknown
push dateunknown
reviewerskarlt
bugs1026986
milestone33.0a1
Bug 1026986 Allow to build InstallX11ErrorHandler() at building Qt-build r=karlt
toolkit/xre/nsX11ErrorHandler.cpp
toolkit/xre/nsX11ErrorHandler.h
--- a/toolkit/xre/nsX11ErrorHandler.cpp
+++ b/toolkit/xre/nsX11ErrorHandler.cpp
@@ -154,17 +154,17 @@ X11Error(Display *display, XErrorEvent *
   }
 #endif
 
   NS_RUNTIMEABORT(notes.get());
   return 0; // not reached
 }
 }
 
-#if (MOZ_WIDGET_GTK == 2)
+#if (MOZ_WIDGET_GTK != 3)
 void
 InstallX11ErrorHandler()
 {
   XSetErrorHandler(X11Error);
 
   Display *display = mozilla::DefaultXDisplay();
   NS_ASSERTION(display, "No X display");
   if (PR_GetEnv("MOZ_X_SYNC")) {
--- a/toolkit/xre/nsX11ErrorHandler.h
+++ b/toolkit/xre/nsX11ErrorHandler.h
@@ -1,12 +1,12 @@
 /* -*- Mode: C++; tab-width: 40; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifdef MOZ_X11
 #include <X11/Xlib.h>
-#if (MOZ_WIDGET_GTK == 2)
+#if (MOZ_WIDGET_GTK != 3)
 void InstallX11ErrorHandler();
 #endif
 extern "C" int X11Error(Display *display, XErrorEvent *event);
 #endif