Bug 1038799 - Properly wrap Xfixes.h header. r=glandium
authorGian-Carlo Pascutto <gpascutto@mozilla.com>
Wed, 16 Jul 2014 19:16:38 +0200
changeset 194420 d77d27828c76c96a229155cefcc7010ed434c947
parent 194419 fc27403a5f814ec9bed575e14b7f0dc8ee978c91
child 194421 19f35def6780c9acae910e40e956f233afb7218c
push id27145
push userkwierso@gmail.com
push dateThu, 17 Jul 2014 00:08:55 +0000
treeherdermozilla-central@8e8f3ba64655 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1038799
milestone33.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 1038799 - Properly wrap Xfixes.h header. r=glandium
CLOBBER
config/system-headers
media/webrtc/trunk/webrtc/modules/desktop_capture/x11/desktop_device_info_x11.cc
--- a/CLOBBER
+++ b/CLOBBER
@@ -17,9 +17,9 @@
 #
 # Modifying this file will now automatically clobber the buildbot machines \o/
 #
 
 # Are you updating CLOBBER because you think it's needed for your WebIDL
 # changes to stick? As of bug 928195, this shouldn't be necessary! Please
 # don't change CLOBBER for WebIDL changes any more.
 
-Bug 1024707 - It seems like changing 3 uuids is just too much!
\ No newline at end of file
+Bug 1038799 - And be wary of your ccache too.
--- a/config/system-headers
+++ b/config/system-headers
@@ -1239,16 +1239,17 @@ wx/toolbar.h
 wx/wx.h
 wx/xrc/xmlres.h
 X11/cursorfont.h
 X11/extensions/Print.h
 X11/extensions/shape.h
 X11/extensions/scrnsaver.h
 X11/extensions/XShm.h
 X11/extensions/Xrender.h
+X11/extensions/Xfixes.h
 X11/extensions/Xdamage.h
 X11/extensions/Xcomposite.h
 X11/Intrinsic.h
 X11/keysymdef.h
 X11/keysym.h
 X11/Shell.h
 X11/StringDefs.h
 X11/Xatom.h
--- a/media/webrtc/trunk/webrtc/modules/desktop_capture/x11/desktop_device_info_x11.cc
+++ b/media/webrtc/trunk/webrtc/modules/desktop_capture/x11/desktop_device_info_x11.cc
@@ -1,13 +1,14 @@
 /* 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/. */
 
 #include "webrtc/modules/desktop_capture/x11/desktop_device_info_x11.h"
+#include "webrtc/modules/desktop_capture/window_capturer.h"
 
 namespace webrtc{
 
 DesktopDeviceInfo * DesktopDeviceInfoImpl::Create() {
   DesktopDeviceInfoX11 * pDesktopDeviceInfo = new DesktopDeviceInfoX11();
   if (pDesktopDeviceInfo && pDesktopDeviceInfo->Init() != 0){
     delete pDesktopDeviceInfo;
     pDesktopDeviceInfo = NULL;