diff options
| author | Michael Albinus | 2020-12-30 10:49:48 +0100 |
|---|---|---|
| committer | Michael Albinus | 2020-12-30 10:49:48 +0100 |
| commit | baeb82df8bcb8dd7dd783dbfb5561415da4ea3a9 (patch) | |
| tree | 262393fdf48b250907c36b9a661b8947c5f7527c | |
| parent | 75191b0af20d1e29edb1744bd7574ed77f91f8f6 (diff) | |
| download | emacs-baeb82df8bcb8dd7dd783dbfb5561415da4ea3a9.tar.gz emacs-baeb82df8bcb8dd7dd783dbfb5561415da4ea3a9.zip | |
* src/dbusbind.c (XD_BASIC_DBUS_TYPE): Fix error in declaration.
| -rw-r--r-- | src/dbusbind.c | 43 |
1 files changed, 28 insertions, 15 deletions
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; | |||
| 132 | #define XD_BASIC_DBUS_TYPE(type) \ | 132 | #define XD_BASIC_DBUS_TYPE(type) \ |
| 133 | (dbus_type_is_valid (type) && dbus_type_is_basic (type)) | 133 | (dbus_type_is_valid (type) && dbus_type_is_basic (type)) |
| 134 | #else | 134 | #else |
| 135 | #define XD_BASIC_DBUS_TYPE(type) \ | ||
| 136 | ((type == DBUS_TYPE_BYTE) \ | ||
| 137 | || (type == DBUS_TYPE_BOOLEAN) \ | ||
| 138 | || (type == DBUS_TYPE_INT16) \ | ||
| 139 | || (type == DBUS_TYPE_UINT16) \ | ||
| 140 | || (type == DBUS_TYPE_INT32) \ | ||
| 141 | || (type == DBUS_TYPE_UINT32) \ | ||
| 142 | || (type == DBUS_TYPE_INT64) \ | ||
| 143 | || (type == DBUS_TYPE_UINT64) \ | ||
| 144 | || (type == DBUS_TYPE_DOUBLE) \ | ||
| 145 | || (type == DBUS_TYPE_STRING) \ | ||
| 146 | || (type == DBUS_TYPE_OBJECT_PATH) \ | ||
| 147 | || (type == DBUS_TYPE_SIGNATURE) \ | ||
| 148 | #ifdef DBUS_TYPE_UNIX_FD | 135 | #ifdef DBUS_TYPE_UNIX_FD |
| 149 | || (type == DBUS_TYPE_UNIX_FD) \ | 136 | #define XD_BASIC_DBUS_TYPE(type) \ |
| 137 | ((type == DBUS_TYPE_BYTE) \ | ||
| 138 | || (type == DBUS_TYPE_BOOLEAN) \ | ||
| 139 | || (type == DBUS_TYPE_INT16) \ | ||
| 140 | || (type == DBUS_TYPE_UINT16) \ | ||
| 141 | || (type == DBUS_TYPE_INT32) \ | ||
| 142 | || (type == DBUS_TYPE_UINT32) \ | ||
| 143 | || (type == DBUS_TYPE_INT64) \ | ||
| 144 | || (type == DBUS_TYPE_UINT64) \ | ||
| 145 | || (type == DBUS_TYPE_DOUBLE) \ | ||
| 146 | || (type == DBUS_TYPE_STRING) \ | ||
| 147 | || (type == DBUS_TYPE_OBJECT_PATH) \ | ||
| 148 | || (type == DBUS_TYPE_SIGNATURE) \ | ||
| 149 | || (type == DBUS_TYPE_UNIX_FD)) | ||
| 150 | #else | ||
| 151 | #define XD_BASIC_DBUS_TYPE(type) \ | ||
| 152 | ((type == DBUS_TYPE_BYTE) \ | ||
| 153 | || (type == DBUS_TYPE_BOOLEAN) \ | ||
| 154 | || (type == DBUS_TYPE_INT16) \ | ||
| 155 | || (type == DBUS_TYPE_UINT16) \ | ||
| 156 | || (type == DBUS_TYPE_INT32) \ | ||
| 157 | || (type == DBUS_TYPE_UINT32) \ | ||
| 158 | || (type == DBUS_TYPE_INT64) \ | ||
| 159 | || (type == DBUS_TYPE_UINT64) \ | ||
| 160 | || (type == DBUS_TYPE_DOUBLE) \ | ||
| 161 | || (type == DBUS_TYPE_STRING) \ | ||
| 162 | || (type == DBUS_TYPE_OBJECT_PATH) \ | ||
| 163 | || (type == DBUS_TYPE_SIGNATURE)) | ||
| 150 | #endif | 164 | #endif |
| 151 | ) | ||
| 152 | #endif | 165 | #endif |
| 153 | 166 | ||
| 154 | /* This was a macro. On Solaris 2.11 it was said to compile for | 167 | /* This was a macro. On Solaris 2.11 it was said to compile for |