Bug 614751 - can't compile nsHapticFeedback.cpp on maemo6 r=blassey.bugs a=npodb
authorOleg Romashin <romaxa@gmail.com>
Mon, 29 Nov 2010 09:33:34 +0200
changeset 58316 5f9204fe5cd58a3e0e32b3af66f00edb73191b33
parent 58315 a5ec817740f0047309cb284a9b145e240719c81d
child 58317 0c42968a2c753e478cd62d3591fe3eb09f9fc4da
push id17241
push userromaxa@gmail.com
push dateMon, 29 Nov 2010 07:34:16 +0000
treeherdermozilla-central@5f9204fe5cd5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersblassey.bugs, npodb
bugs614751
milestone2.0b8pre
first release with
nightly linux32
5f9204fe5cd5 / 4.0b8pre / 20101129030317 / files
nightly linux64
5f9204fe5cd5 / 4.0b8pre / 20101129030317 / files
nightly mac
5f9204fe5cd5 / 4.0b8pre / 20101129030317 / files
nightly win32
5f9204fe5cd5 / 4.0b8pre / 20101129030317 / files
nightly win64
5f9204fe5cd5 / 4.0b8pre / 20101129044747 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 614751 - can't compile nsHapticFeedback.cpp on maemo6 r=blassey.bugs a=npodb
dom/system/unix/Makefile.in
dom/system/unix/nsHapticFeedback.cpp
--- a/dom/system/unix/Makefile.in
+++ b/dom/system/unix/Makefile.in
@@ -59,11 +59,13 @@ ifdef MOZ_MAEMO_LIBLOCATION
         CPPSRCS         += MaemoLocationProvider.cpp
         LOCAL_INCLUDES  += $(MOZ_PLATFORM_MAEMO_CFLAGS) \
                            -I$(topsrcdir)/dom/src/geolocation \
                            $(NULL)
 endif
 
 ifdef MOZ_PLATFORM_MAEMO
 CPPSRCS += nsHapticFeedback.cpp
+LOCAL_INCLUDES  += $(MOZ_DBUS_CFLAGS) \
+                   $(NULL)
 endif
 
 include $(topsrcdir)/config/rules.mk
--- a/dom/system/unix/nsHapticFeedback.cpp
+++ b/dom/system/unix/nsHapticFeedback.cpp
@@ -41,17 +41,17 @@
 #include <mce/dbus-names.h>
 #endif
 
 NS_IMPL_ISUPPORTS1(nsHapticFeedback, nsIHapticFeedback)
 
 NS_IMETHODIMP
 nsHapticFeedback::PerformSimpleAction(PRInt32 aType)
 {
-#ifdef MOZ_PLATFORM_MAEMO
+#if (MOZ_PLATFORM_MAEMO == 5)
     DBusError err;
     dbus_error_init(&err);
 
     DBusConnection  *connection;
     connection = dbus_bus_get(DBUS_BUS_SYSTEM, &err);
     if (dbus_error_is_set(&err)) {
         dbus_error_free(&err);
         return NS_ERROR_FAILURE;