From: Michael Albinus <michael.albinus@gmx.de>
Date: Wed, 30 Dec 2020 09:49:48 +0000 (+0100)
Subject: * src/dbusbind.c (XD_BASIC_DBUS_TYPE): Fix error in declaration.
X-Git-Tag: emacs-28.0.90~4486
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=baeb82df8bcb8dd7dd783dbfb5561415da4ea3a9;p=emacs.git

* src/dbusbind.c (XD_BASIC_DBUS_TYPE): Fix error in declaration.
---

diff --git a/src/dbusbind.c b/src/dbusbind.c
index dc4db5c8513..dda862d975d 100644
--- a/src/dbusbind.c
+++ b/src/dbusbind.c
@@ -132,23 +132,36 @@ static bool xd_in_read_queued_messages = 0;
 #define XD_BASIC_DBUS_TYPE(type)					\
   (dbus_type_is_valid (type) && dbus_type_is_basic (type))
 #else
-#define XD_BASIC_DBUS_TYPE(type)					\
-  ((type == DBUS_TYPE_BYTE)						\
-   || (type == DBUS_TYPE_BOOLEAN)					\
-   || (type == DBUS_TYPE_INT16)						\
-   || (type == DBUS_TYPE_UINT16)					\
-   || (type == DBUS_TYPE_INT32)						\
-   || (type == DBUS_TYPE_UINT32)					\
-   || (type == DBUS_TYPE_INT64)						\
-   || (type == DBUS_TYPE_UINT64)					\
-   || (type == DBUS_TYPE_DOUBLE)					\
-   || (type == DBUS_TYPE_STRING)					\
-   || (type == DBUS_TYPE_OBJECT_PATH)					\
-   || (type == DBUS_TYPE_SIGNATURE)					\
 #ifdef DBUS_TYPE_UNIX_FD
-   || (type == DBUS_TYPE_UNIX_FD)					\
+#define XD_BASIC_DBUS_TYPE(type)					\
+  ((type ==  DBUS_TYPE_BYTE)						\
+   || (type ==  DBUS_TYPE_BOOLEAN)					\
+   || (type ==  DBUS_TYPE_INT16)					\
+   || (type ==  DBUS_TYPE_UINT16)					\
+   || (type ==  DBUS_TYPE_INT32)					\
+   || (type ==  DBUS_TYPE_UINT32)					\
+   || (type ==  DBUS_TYPE_INT64)					\
+   || (type ==  DBUS_TYPE_UINT64)					\
+   || (type ==  DBUS_TYPE_DOUBLE)					\
+   || (type ==  DBUS_TYPE_STRING)					\
+   || (type ==  DBUS_TYPE_OBJECT_PATH)					\
+   || (type ==  DBUS_TYPE_SIGNATURE)					\
+   || (type ==  DBUS_TYPE_UNIX_FD))
+#else
+#define XD_BASIC_DBUS_TYPE(type)					\
+  ((type ==  DBUS_TYPE_BYTE)						\
+   || (type ==  DBUS_TYPE_BOOLEAN)					\
+   || (type ==  DBUS_TYPE_INT16)					\
+   || (type ==  DBUS_TYPE_UINT16)					\
+   || (type ==  DBUS_TYPE_INT32)					\
+   || (type ==  DBUS_TYPE_UINT32)					\
+   || (type ==  DBUS_TYPE_INT64)					\
+   || (type ==  DBUS_TYPE_UINT64)					\
+   || (type ==  DBUS_TYPE_DOUBLE)					\
+   || (type ==  DBUS_TYPE_STRING)					\
+   || (type ==  DBUS_TYPE_OBJECT_PATH)					\
+   || (type ==  DBUS_TYPE_SIGNATURE))
 #endif
-   )
 #endif
 
 /* This was a macro.  On Solaris 2.11 it was said to compile for