Bug 1246931: Include dbus.h in DBus IPC headers, r=shuang
authorThomas Zimmermann <tdz@users.sourceforge.net>
Tue, 12 Apr 2016 16:14:39 +0200
changeset 330699 0aa22bba65ea49734df5dff847ee2a982db74c3a
parent 330698 203f3bb029cf0a02bc26e00c202bfad17afa3e42
child 330700 e4a77716c6eae759178da2f72ff9bb8064684423
push id6048
push userkmoir@mozilla.com
push dateMon, 06 Jun 2016 19:02:08 +0000
treeherdermozilla-beta@46d72a56c57d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersshuang
bugs1246931
milestone48.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 1246931: Include dbus.h in DBus IPC headers, r=shuang The header files for DBus IPC forward declare several DBus types in a way that interferes with the actual declarations. It's better to include the DBus headers directly
ipc/dbus/DBusUtils.h
--- a/ipc/dbus/DBusUtils.h
+++ b/ipc/dbus/DBusUtils.h
@@ -14,26 +14,24 @@
 ** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 ** See the License for the specific language governing permissions and
 ** limitations under the License.
 */
 
 #ifndef mozilla_ipc_dbus_dbusutils_h__
 #define mozilla_ipc_dbus_dbusutils_h__
 
+#include <dbus/dbus.h>
 #include "mozilla/RefPtr.h"
 
 // LOGE and free a D-Bus error
 // Using #define so that __FUNCTION__ resolves usefully
 #define LOG_AND_FREE_DBUS_ERROR_WITH_MSG(err, msg) log_and_free_dbus_error(err, __FUNCTION__, msg);
 #define LOG_AND_FREE_DBUS_ERROR(err) log_and_free_dbus_error(err, __FUNCTION__);
 
-struct DBusError;
-struct DBusMessage;
-
 namespace mozilla {
 namespace ipc {
 
 class DBusMessageRefPtr
 {
 public:
   DBusMessageRefPtr(DBusMessage* aMsg);
   ~DBusMessageRefPtr();