Fix cygw32 build break with dbus compilation

diff --git a/src/ChangeLog b/src/ChangeLog
index bb7ddcfd39e41feaedf65060e950e95ab575a231..e142cad7bf6b50a39ec54b0687a93a100a280952 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2012-10-15  Daniel Colascione  <dancol@dancol.org>
+
+       * 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  <dancol@dancol.org>
 
        * image.c (init_tiff_functions, init_imagemagick_functions)

diff --git a/src/dbusbind.c b/src/dbusbind.c
index c2eefd605bb22bf8012a3e0771daaac99cfa2840..43938bb79d5324226b87fadaef2896c2130df6e3 100644 (file)
--- a/src/dbusbind.c
+++ b/src/dbusbind.c
@@ -32,6 +32,10 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define DBUS_NUM_MESSAGE_TYPES 5
 #endif
 
+#ifdef interface
+#undef interface
+#endif
+
 \f
 /* Subroutines.  */
 static Lisp_Object Qdbus_init_bus;