aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYong-iL Joh <yong-il.joh@windriver.com>2016-04-27 22:43:18 +0900
committerYong-iL Joh <yong-il.joh@windriver.com>2016-04-28 18:27:17 +0900
commit780b0ed18ab2a3db53d00ab9492807fe231cae59 (patch)
tree66aa6deb6303a883410052f9f881629c8531d5cc
parente2a74c42c2e62452a01619f67d4dbac81b83fa51 (diff)
downloadmeta-ivi-780b0ed18ab2a3db53d00ab9492807fe231cae59.tar.gz
meta-ivi-780b0ed18ab2a3db53d00ab9492807fe231cae59.tar.bz2
meta-ivi-780b0ed18ab2a3db53d00ab9492807fe231cae59.zip
dbus: modify capi-dbus-add-support-for-custom-marshalling.patch for 1.10.6
Signed-off-by: Yong-iL Joh <yong-il.joh@windriver.com>
-rw-r--r--meta-ivi/recipes-core-ivi/dbus/dbus/capi-dbus-add-support-for-custom-marshalling.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/meta-ivi/recipes-core-ivi/dbus/dbus/capi-dbus-add-support-for-custom-marshalling.patch b/meta-ivi/recipes-core-ivi/dbus/dbus/capi-dbus-add-support-for-custom-marshalling.patch
index 78b073c..a6515e1 100644
--- a/meta-ivi/recipes-core-ivi/dbus/dbus/capi-dbus-add-support-for-custom-marshalling.patch
+++ b/meta-ivi/recipes-core-ivi/dbus/dbus/capi-dbus-add-support-for-custom-marshalling.patch
@@ -193,7 +193,7 @@ diff --git a/dbus/dbus-string.h b/dbus/dbus-string.h
index 86fb8c3..bfa2a39 100644
--- a/dbus/dbus-string.h
+++ b/dbus/dbus-string.h
-@@ -61,6 +61,7 @@ struct DBusString
+@@ -61,6 +61,7 @@
*/
#define _dbus_string_get_data(s) ((char*)(((DBusString*)(s))->dummy1))
#define _dbus_string_get_length(s) (((DBusString*)(s))->dummy2)
@@ -201,7 +201,7 @@ index 86fb8c3..bfa2a39 100644
#define _dbus_string_set_byte(s, i, b) ((((unsigned char*)(((DBusString*)(s))->dummy1))[(i)]) = (unsigned char) (b))
#define _dbus_string_get_byte(s, i) (((const unsigned char*)(((DBusString*)(s))->dummy1))[(i)])
#define _dbus_string_get_const_data(s) ((const char*)(((DBusString*)(s))->dummy1))
-@@ -131,6 +132,10 @@ void _dbus_string_copy_to_buffer_with_nul (const DBusString *str,
+@@ -151,6 +152,10 @@
int _dbus_string_get_length (const DBusString *str);
#endif /* !_dbus_string_get_length */
@@ -209,9 +209,9 @@ index 86fb8c3..bfa2a39 100644
+int _dbus_string_get_allocated (const DBusString *str);
+#endif /* !_dbus_string_get_allocated */
+
- dbus_bool_t _dbus_string_lengthen (DBusString *str,
- int additional_length);
- void _dbus_string_shorten (DBusString *str,
+ /**
+ * Get the string's length as an unsigned integer, for comparison with
+ * size_t and similar unsigned types that does not trigger compiler
--
1.9.1