[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r110549: Fix cygw32 build break with
From: |
Daniel Colascione |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r110549: Fix cygw32 build break with dbus compilation |
Date: |
Sun, 14 Oct 2012 17:38:07 -0800 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 110549
committer: Daniel Colascione <address@hidden>
branch nick: cyg
timestamp: Sun 2012-10-14 17:38:07 -0800
message:
Fix cygw32 build break with dbus compilation
modified:
src/ChangeLog
src/dbusbind.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2012-10-14 23:25:37 +0000
+++ b/src/ChangeLog 2012-10-15 01:38:07 +0000
@@ -1,3 +1,9 @@
+2012-10-15 Daniel Colascione <address@hidden>
+
+ * 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 <address@hidden>
* image.c (init_tiff_functions, init_imagemagick_functions)
=== modified file 'src/dbusbind.c'
--- a/src/dbusbind.c 2012-09-15 07:06:56 +0000
+++ b/src/dbusbind.c 2012-10-15 01:38:07 +0000
@@ -32,6 +32,10 @@
#define DBUS_NUM_MESSAGE_TYPES 5
#endif
+#ifdef interface
+#undef interface
+#endif
+
/* Subroutines. */
static Lisp_Object Qdbus_init_bus;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r110549: Fix cygw32 build break with dbus compilation,
Daniel Colascione <=