[Bug 48838] New: Fails to compile due to wrong #ifdef
https://bugs.winehq.org/show_bug.cgi?id=48838 Bug ID: 48838 Summary: Fails to compile due to wrong #ifdef Product: Wine Version: unspecified Hardware: x86 OS: Linux Status: UNCONFIRMED Severity: critical Priority: P2 Component: wldap32 Assignee: wine-bugs(a)winehq.org Reporter: harry+winehq(a)unheit.net Distribution: --- Bug introduced in commit 364ac6787a39e2037f87ca7d728c949564c634b1. dlls/wldap32/bind.c defines function sasl_interact, which uses TRACE. Function is in #ifdef HAVE_LDAP_H but WINE_DEFAULT_DEBUG_CHANNEL is in #ifdef HAVE_LDAP. So if HAVE_LDAP_H is defined but HAVE_LDAP isnt, compilation failes. Fix: diff --git a/dlls/wldap32/bind.c b/dlls/wldap32/bind.c index 63d4208eef..46b866fd31 100644 --- a/dlls/wldap32/bind.c +++ b/dlls/wldap32/bind.c @@ -179,7 +179,7 @@ exit: return ret; } -#ifdef HAVE_LDAP_H +#ifdef HAVE_LDAP static int sasl_interact( LDAP *ld, unsigned flags, void *defaults, void *interact ) { @@ -219,7 +219,7 @@ static int sasl_interact( LDAP *ld, unsigned flags, void *defaults, void *intera #endif /* HAVE_SASL_SASL_H */ } -#endif /* HAVE_LDAP_H */ +#endif /* HAVE_LDAP */ -- Do not reply to this email, post in Bugzilla using the above URL to reply. You are receiving this mail because: You are watching all bug changes.
https://bugs.winehq.org/show_bug.cgi?id=48838 Austin English <austinenglish(a)gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Keywords| |download, patch, regression Regression SHA1| |364ac6787a39e2037f87ca7d728 | |c949564c634b1 CC| |dmitry(a)baikal.ru --- Comment #1 from Austin English <austinenglish(a)gmail.com> --- Please send your patch to wine-patches(a)winehq.org, it won't be picked up from bugzilla. See https://wiki.winehq.org/Submitting_Patches -- Do not reply to this email, post in Bugzilla using the above URL to reply. You are receiving this mail because: You are watching all bug changes.
https://bugs.winehq.org/show_bug.cgi?id=48838 Dmitry Timoshkov <dmitry(a)baikal.ru> changed: What |Removed |Added ---------------------------------------------------------------------------- Ever confirmed|0 |1 Status|UNCONFIRMED |NEW Version|unspecified |5.5 --- Comment #2 from Dmitry Timoshkov <dmitry(a)baikal.ru> --- (In reply to harry from comment #0)
-#ifdef HAVE_LDAP_H +#ifdef HAVE_LDAP
static int sasl_interact( LDAP *ld, unsigned flags, void *defaults, void *interact ) { @@ -219,7 +219,7 @@ static int sasl_interact( LDAP *ld, unsigned flags, void *defaults, void *intera #endif /* HAVE_SASL_SASL_H */ }
-#endif /* HAVE_LDAP_H */ +#endif /* HAVE_LDAP */
Thank you very much for reporting the bug and the proposed fix. I have to adimit that HAVE_LDAP_H vs HAVE_LDAP are a bit confising :) Are you planning to send the patch to winehq for inclusion? If not I can do it on your behalf. -- Do not reply to this email, post in Bugzilla using the above URL to reply. You are receiving this mail because: You are watching all bug changes.
https://bugs.winehq.org/show_bug.cgi?id=48838 --- Comment #3 from harry <harry+winehq(a)unheit.net> --- (In reply to Dmitry Timoshkov from comment #2)
Are you planning to send the patch to winehq for inclusion? If not I can do it on your behalf.
That would be nice, thank you. I have no experience with that and it looks very complicated. Regards harry -- Do not reply to this email, post in Bugzilla using the above URL to reply. You are receiving this mail because: You are watching all bug changes.
https://bugs.winehq.org/show_bug.cgi?id=48838 Dmitry Timoshkov <dmitry(a)baikal.ru> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Fixed by SHA1| |02d266adfd35c5e3550e533c3bd | |1b1f2cecc6fbc Resolution|--- |FIXED --- Comment #4 from Dmitry Timoshkov <dmitry(a)baikal.ru> --- Committed as 02d266adfd35c5e3550e533c3bd1b1f2cecc6fbc. -- Do not reply to this email, post in Bugzilla using the above URL to reply. You are receiving this mail because: You are watching all bug changes.
https://bugs.winehq.org/show_bug.cgi?id=48838 --- Comment #5 from Dmitry Timoshkov <dmitry(a)baikal.ru> --- (In reply to harry from comment #3)
That would be nice, thank you. I have no experience with that and it looks very complicated.
Probably I should mention that as promised I sent the patch with From: harry+winehq(a)unheit.net https://www.winehq.org/pipermail/wine-devel/2020-March/163239.html However it was attributed to me. Not sure why that happend. -- Do not reply to this email, post in Bugzilla using the above URL to reply. You are receiving this mail because: You are watching all bug changes.
https://bugs.winehq.org/show_bug.cgi?id=48838 Anastasius Focht <focht(a)gmx.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Summary|Fails to compile due to |Wine fails to build wldap32 |wrong #ifdef |if LDAP is not installed CC| |focht(a)gmx.net --- Comment #6 from Anastasius Focht <focht(a)gmx.net> --- Hello folks, I've refined the summary to be a bit to be more specific, mentioning the component. Remember: the ticket summary is included in public Wine release notes. "Fails to compile due to wrong #ifdef" -> could mean Wine doesn't build at all for all users. In this case only a limited number of users/devs are affected. Regards -- Do not reply to this email, post in Bugzilla using the above URL to reply. You are receiving this mail because: You are watching all bug changes.
https://bugs.winehq.org/show_bug.cgi?id=48838 Alexandre Julliard <julliard(a)winehq.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|RESOLVED |CLOSED --- Comment #7 from Alexandre Julliard <julliard(a)winehq.org> --- Closing bugs fixed in 5.6. -- Do not reply to this email, post in Bugzilla using the above URL to reply. You are receiving this mail because: You are watching all bug changes.
participants (1)
-
WineHQ Bugzilla