emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] emacs-25 f8d8e0b 03/14: Fix last change


From: Eli Zaretskii
Subject: [Emacs-diffs] emacs-25 f8d8e0b 03/14: Fix last change
Date: Fri, 13 Nov 2015 20:03:32 +0000

branch: emacs-25
commit f8d8e0b7aac45706354dd0e4c8044ba4103ff208
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Fix last change
    
    * src/w32fns.c (syms_of_w32fns) [WINDOWSNT && !HAVE_DBUS]:
    Don't DEFSYM tray notification symbols if D-Bus is being used.
    
    Backport.
---
 src/w32fns.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/w32fns.c b/src/w32fns.c
index 475864b..f2d286d 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -9294,6 +9294,7 @@ syms_of_w32fns (void)
   DEFSYM (Qframes, "frames");
   DEFSYM (Qtip_frame, "tip-frame");
   DEFSYM (Qunicode_sip, "unicode-sip");
+#if defined WINDOWSNT && !defined HAVE_DBUS
   DEFSYM (QCicon, ":icon");
   DEFSYM (QCtip, ":tip");
   DEFSYM (QClevel, ":level");
@@ -9302,6 +9303,7 @@ syms_of_w32fns (void)
   DEFSYM (QCtimeout, ":timeout");
   DEFSYM (QCtitle, ":title");
   DEFSYM (QCbody, ":body");
+#endif
 
   /* Symbols used elsewhere, but only in MS-Windows-specific code.  */
   DEFSYM (Qgnutls_dll, "gnutls");



reply via email to

[Prev in Thread] Current Thread [Next in Thread]