diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2015-11-13 11:02:04 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2015-11-13 21:57:33 +0200 |
| commit | 82f3dc0ea251f456fd2ed5983eef8bb3adc7cf3d (patch) | |
| tree | a82a491959bacceca20a2410a70308dbc25e5b46 /src/w32fns.c | |
| parent | 071b2e16a0ca8baaf4fa7d52aaa84a652243475e (diff) | |
| download | emacs-82f3dc0ea251f456fd2ed5983eef8bb3adc7cf3d.tar.gz emacs-82f3dc0ea251f456fd2ed5983eef8bb3adc7cf3d.tar.bz2 emacs-82f3dc0ea251f456fd2ed5983eef8bb3adc7cf3d.zip | |
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 <andrewjmoreton@gmail.com>.
Backport.
Diffstat (limited to 'src/w32fns.c')
| -rw-r--r-- | src/w32fns.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/w32fns.c b/src/w32fns.c index b71002f8bfc..475864bb45b 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); |