From 3e0341b0a481d833942f3964a70e7f3494588ce6 Mon Sep 17 00:00:00 2001 From: Daniel Colascione Date: Sun, 14 Oct 2012 17:38:07 -0800 Subject: [PATCH] Fix cygw32 build break with dbus compilation --- src/ChangeLog | 6 ++++++ src/dbusbind.c | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/src/ChangeLog b/src/ChangeLog index bb7ddcfd39e..e142cad7bf6 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2012-10-15 Daniel Colascione + + * dbusbind.c: Fix cygw32 build break when compiling with dbus + enabled by undefining the symbol "interface", which the platform + headers define to something incompatible. + 2012-10-14 Daniel Colascione * image.c (init_tiff_functions, init_imagemagick_functions) diff --git a/src/dbusbind.c b/src/dbusbind.c index c2eefd605bb..43938bb79d5 100644 --- a/src/dbusbind.c +++ b/src/dbusbind.c @@ -32,6 +32,10 @@ along with GNU Emacs. If not, see . */ #define DBUS_NUM_MESSAGE_TYPES 5 #endif +#ifdef interface +#undef interface +#endif + /* Subroutines. */ static Lisp_Object Qdbus_init_bus; -- 2.39.2