diff options
| author | christian mueller <christian.ei.mueller@bmw.de> | 2012-01-18 13:28:09 +0100 |
|---|---|---|
| committer | christian mueller <christian.ei.mueller@bmw.de> | 2012-01-18 14:01:48 +0100 |
| commit | adf0d48f869007e4527b00e1a346ed37ee82cc1a (patch) | |
| tree | 48a8b7cdbf60aba53e82bbffbb1199fff865238a /PluginCommandInterfaceDbus | |
| parent | 8a99f39f0a5b84230bb6e764950dc674258870e8 (diff) | |
| download | audiomanager-adf0d48f869007e4527b00e1a346ed37ee82cc1a.tar.gz | |
* fix for package building with lower cmake versions
* fix DBus interface to be GLIB tolerant 32bit types
Diffstat (limited to 'PluginCommandInterfaceDbus')
| -rw-r--r-- | PluginCommandInterfaceDbus/src/DBusMessageHandler.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/PluginCommandInterfaceDbus/src/DBusMessageHandler.cpp b/PluginCommandInterfaceDbus/src/DBusMessageHandler.cpp index 856dbd0..adc157f 100644 --- a/PluginCommandInterfaceDbus/src/DBusMessageHandler.cpp +++ b/PluginCommandInterfaceDbus/src/DBusMessageHandler.cpp @@ -171,7 +171,11 @@ dbus_uint16_t DBusMessageHandler::getUInt() { dbus_uint16_t param; +#ifdef GLIB_DBUS_TYPES_TOLERANT + if (DBUS_TYPE_UINT16 != dbus_message_iter_get_arg_type(&mDBusMessageIter) && DBUS_TYPE_UINT32 != dbus_message_iter_get_arg_type(&mDBusMessageIter)) +#else if (DBUS_TYPE_UINT16 != dbus_message_iter_get_arg_type(&mDBusMessageIter)) +#endif { DLT_LOG(DLT_CONTEXT,DLT_LOG_ERROR, DLT_STRING("DBusMessageHandler::getUInt DBUS handler argument is no uint16_t!")); mErrorName=std::string(DBUS_ERROR_INVALID_ARGS); @@ -189,7 +193,11 @@ dbus_int16_t DBusMessageHandler::getInt() { dbus_int16_t param; +#ifdef GLIB_DBUS_TYPES_TOLERANT + if (DBUS_TYPE_INT16 != dbus_message_iter_get_arg_type(&mDBusMessageIter) && DBUS_TYPE_INT32 != dbus_message_iter_get_arg_type(&mDBusMessageIter)) +#else if (DBUS_TYPE_INT16 != dbus_message_iter_get_arg_type(&mDBusMessageIter)) +#endif { DLT_LOG(DLT_CONTEXT,DLT_LOG_ERROR, DLT_STRING("DBusMessageHandler::getInt DBUS handler argument is no int16_t!")); mErrorName=std::string(DBUS_ERROR_INVALID_ARGS); |