aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMichael Albinus2009-12-15 05:59:39 +0000
committerMichael Albinus2009-12-15 05:59:39 +0000
commitfa8e045a8a4cbf2463d3848a038e2863fb38c55c (patch)
tree9a1fad0807772eec19db89f63c1595458ddcd301 /src
parent93e01d46bd928614e885bfd9e90cf6e38635ec70 (diff)
downloademacs-fa8e045a8a4cbf2463d3848a038e2863fb38c55c.tar.gz
emacs-fa8e045a8a4cbf2463d3848a038e2863fb38c55c.zip
* dbusbind.c (xd_retrieve_arg): Reorder declarations in order to
avoid compiler warnings. (Bug #5217).
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/dbusbind.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 352a7239acf..69c8f22e700 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12009-12-15 Michael Albinus <michael.albinus@gmx.de>
2
3 * dbusbind.c (xd_retrieve_arg): Reorder declarations in order to
4 avoid compiler warnings. (Bug #5217).
5
12009-12-14 Kenichi Handa <handa@m17n.org> 62009-12-14 Kenichi Handa <handa@m17n.org>
2 7
3 * coding.c (decode_coding_iso_2022): Ignore ISO_CODE_SS2_7 (0x19) 8 * coding.c (decode_coding_iso_2022): Ignore ISO_CODE_SS2_7 (0x19)
diff --git a/src/dbusbind.c b/src/dbusbind.c
index d83ef4a5966..7c0be49ab77 100644
--- a/src/dbusbind.c
+++ b/src/dbusbind.c
@@ -688,10 +688,10 @@ xd_retrieve_arg (dtype, iter)
688 { 688 {
689 Lisp_Object result; 689 Lisp_Object result;
690 struct gcpro gcpro1; 690 struct gcpro gcpro1;
691 result = Qnil;
692 GCPRO1 (result);
693 DBusMessageIter subiter; 691 DBusMessageIter subiter;
694 int subtype; 692 int subtype;
693 result = Qnil;
694 GCPRO1 (result);
695 dbus_message_iter_recurse (iter, &subiter); 695 dbus_message_iter_recurse (iter, &subiter);
696 while ((subtype = dbus_message_iter_get_arg_type (&subiter)) 696 while ((subtype = dbus_message_iter_get_arg_type (&subiter))
697 != DBUS_TYPE_INVALID) 697 != DBUS_TYPE_INVALID)