Sync with 2.x

diff --git a/libraries/libldap/ldap-int.h b/libraries/libldap/ldap-int.h
index 0bd22e560d16822ddafe86936437bdc3d0ac7cc1..b9eedb013075deb364aaa47ed6beacfc6bac2d29 100644 (file)
--- a/libraries/libldap/ldap-int.h
+++ b/libraries/libldap/ldap-int.h
@@ -305,7 +305,7 @@ struct ldap {
 
 #ifdef HAVE_RES_QUERY
 LDAP_V ( ldap_pvt_thread_mutex_t ) ldap_int_resolv_mutex;
-#endif /* HAVE_RES_QUERY */
+#endif
 
 #ifdef HAVE_CYRUS_SASL
 LDAP_V( ldap_pvt_thread_mutex_t ) ldap_int_sasl_mutex;