HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from emacs-24; up to 2012-11-24T16:58:43Z!cyd@gnu.org
[bpt/emacs.git]
/
src
/
dbusbind.c
diff --git
a/src/dbusbind.c
b/src/dbusbind.c
index
9018206
..
8008694
100644
(file)
--- a/
src/dbusbind.c
+++ b/
src/dbusbind.c
@@
-21,7
+21,7
@@
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#ifdef HAVE_DBUS
#include <stdio.h>
#include <dbus/dbus.h>
#ifdef HAVE_DBUS
#include <stdio.h>
#include <dbus/dbus.h>
-#include <setjmp.h>
+
#include "lisp.h"
#include "frame.h"
#include "termhooks.h"
#include "lisp.h"
#include "frame.h"
#include "termhooks.h"
@@
-32,6
+32,14
@@
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#define DBUS_NUM_MESSAGE_TYPES 5
#endif
#define DBUS_NUM_MESSAGE_TYPES 5
#endif
+
+/* Some platforms define the symbol "interface", but we want to use it
+ * as a variable name below. */
+
+#ifdef interface
+#undef interface
+#endif
+
\f
/* Subroutines. */
static Lisp_Object Qdbus_init_bus;
\f
/* Subroutines. */
static Lisp_Object Qdbus_init_bus;
@@
-291,8
+299,8
@@
xd_symbol_to_dbus_type (Lisp_Object object)
} \
} while (0)
} \
} while (0)
-#if (HAVE_DBUS_VALIDATE_BUS_NAME || HAVE_DBUS_VALIDATE_PATH \
- ||
XD_DBUS_VALIDATE_OBJECT
|| HAVE_DBUS_VALIDATE_MEMBER)
+#if (HAVE_DBUS_VALIDATE_BUS_NAME || HAVE_DBUS_VALIDATE_PATH
\
+ ||
HAVE_DBUS_VALIDATE_INTERFACE
|| HAVE_DBUS_VALIDATE_MEMBER)
#define XD_DBUS_VALIDATE_OBJECT(object, func) \
do { \
if (!NILP (object)) \
#define XD_DBUS_VALIDATE_OBJECT(object, func) \
do { \
if (!NILP (object)) \