[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-25 82f3dc0 02/14: Another fix for MinGW64 and Cygwin
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] emacs-25 82f3dc0 02/14: Another fix for MinGW64 and Cygwin builds due to notifications |
Date: |
Fri, 13 Nov 2015 20:03:31 +0000 |
branch: emacs-25
commit 82f3dc0ea251f456fd2ed5983eef8bb3adc7cf3d
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>
Another fix for MinGW64 and Cygwin builds due to notifications
* src/w32fns.c: Ifdef away tray notification code if D-Bus is
being compiled into Emacs.
(syms_of_w32fns) [WINDOWSNT && !HAVE_DBUS]: Don't defsubr
Sw32_notification_notify and Sw32_notification_close if the code
is not compiled. Reported by Andy Moreton <address@hidden>.
Backport.
---
src/w32fns.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/w32fns.c b/src/w32fns.c
index b71002f..475864b 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -8756,7 +8756,7 @@ Internal use only. */)
return menubar_in_use ? Qt : Qnil;
}
-#ifndef __CYGWIN__
+#if defined WINDOWSNT && !defined HAVE_DBUS
/***********************************************************************
Tray notifications
@@ -9219,7 +9219,7 @@ DEFUN ("w32-notification-close",
return Qnil;
}
-#endif /* !__CYGWIN__ */
+#endif /* WINDOWSNT && !HAVE_DBUS */
/***********************************************************************
@@ -9635,8 +9635,10 @@ This variable has effect only on Windows Vista and
later. */);
defsubr (&Sw32_window_exists_p);
defsubr (&Sw32_battery_status);
defsubr (&Sw32__menu_bar_in_use);
+#if defined WINDOWSNT && !defined HAVE_DBUS
defsubr (&Sw32_notification_notify);
defsubr (&Sw32_notification_close);
+#endif
#ifdef WINDOWSNT
defsubr (&Sfile_system_info);
- [Emacs-diffs] emacs-25 updated (26e7624 -> 84c7b38), Eli Zaretskii, 2015/11/13
- [Emacs-diffs] emacs-25 82f3dc0 02/14: Another fix for MinGW64 and Cygwin builds due to notifications,
Eli Zaretskii <=
- [Emacs-diffs] emacs-25 e0d2dc5 04/14: Fix last change in shr.el, Eli Zaretskii, 2015/11/13
- [Emacs-diffs] emacs-25 071b2e1 01/14: Remove intern calls and XXX comments from Fx_export_frames, Eli Zaretskii, 2015/11/13
- [Emacs-diffs] emacs-25 a95781e 07/14: Add a few more variables to redisplay--variables, Eli Zaretskii, 2015/11/13
- [Emacs-diffs] emacs-25 e53f226 09/14: * lisp/progmodes/elisp-mode.el: Declare function `project-roots', Eli Zaretskii, 2015/11/13
- [Emacs-diffs] emacs-25 d6b046c 08/14: * src/undo.c: Small fixes for previous change, Eli Zaretskii, 2015/11/13
- [Emacs-diffs] emacs-25 93e7db1 10/14: * test/automated/simple-test.el: Add test for bug#20698 (bug#21885), Eli Zaretskii, 2015/11/13
- [Emacs-diffs] emacs-25 f8d8e0b 03/14: Fix last change, Eli Zaretskii, 2015/11/13
- [Emacs-diffs] emacs-25 27b93ec 05/14: Fix point positioning after transposing with negative arg, Eli Zaretskii, 2015/11/13
- [Emacs-diffs] emacs-25 afd3e98 06/14: * lisp/loadup.el: Enlarge the size of the hash table to 80000., Eli Zaretskii, 2015/11/13
- [Emacs-diffs] emacs-25 9722634 12/14: * src/undo.c (run_undoable_change): Now static., Eli Zaretskii, 2015/11/13