From: Daniel Colascione <dancol@dancol.org>
Date: Mon, 15 Oct 2012 01:38:07 +0000 (-0800)
Subject: Fix cygw32 build break with dbus compilation
X-Git-Tag: emacs-24.2.90~233^2~16
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3e0341b0a481d833942f3964a70e7f3494588ce6;p=emacs.git

Fix cygw32 build break with dbus compilation
---

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  <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 c2eefd605bb..43938bb79d5 100644
--- 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
+
 
 /* Subroutines.  */
 static Lisp_Object Qdbus_init_bus;