procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Another fix for MinGW64 and Cygwin builds due to notifications

Browse source 
* 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>.
This commit is contained in:
Eli Zaretskii 2015-11-13 11:02:04 +02:00
parent 805a39bcc9
commit d60ed3f33a
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/w32fns.c
View file

@ -8756,7 +8756,7 @@ Internal use only. */)
return menubar_in_use ? Qt : Qnil; return menubar_in_use ? Qt : Qnil;
} }
#ifndef __CYGWIN__ #if defined WINDOWSNT && !defined HAVE_DBUS
/*********************************************************************** /***********************************************************************
Tray notifications Tray notifications
@ -9219,7 +9219,7 @@ DEFUN ("w32-notification-close",
return Qnil; 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_window_exists_p);
defsubr (&Sw32_battery_status); defsubr (&Sw32_battery_status);
defsubr (&Sw32__menu_bar_in_use); defsubr (&Sw32__menu_bar_in_use);
#if defined WINDOWSNT && !defined HAVE_DBUS
defsubr (&Sw32_notification_notify); defsubr (&Sw32_notification_notify);
defsubr (&Sw32_notification_close); defsubr (&Sw32_notification_close);
#endif
#ifdef WINDOWSNT #ifdef WINDOWSNT
defsubr (&Sfile_system_info); defsubr (&Sfile_system_info);