Changeset View
Changeset View
Standalone View
Standalone View
mail/thunderbird/files/patch-bug292127
--- ldap/c-sdk/include/ldap.h~ | --- comm/ldap/c-sdk/include/ldap.h~ | ||||
+++ ldap/c-sdk/include/ldap.h | +++ comm/ldap/c-sdk/include/ldap.h | ||||
@@ -40,6 +40,229 @@ | @@ -40,6 +40,229 @@ | ||||
#ifndef _LDAP_H | #ifndef _LDAP_H | ||||
#define _LDAP_H | #define _LDAP_H | ||||
+/* rename symbols to not clash with openldap (bug 292127) */ | +/* rename symbols to not clash with openldap (bug 292127) */ | ||||
+#define ldap_abandon moz_ldap_abandon | +#define ldap_abandon moz_ldap_abandon | ||||
+#define ldap_abandon_ext moz_ldap_abandon_ext | +#define ldap_abandon_ext moz_ldap_abandon_ext | ||||
+#define ldap_abandoned moz_ldap_abandoned | +#define ldap_abandoned moz_ldap_abandoned | ||||
▲ Show 20 Lines • Show All 211 Lines • ▼ Show 20 Lines | |||||
+#define ldap_x_calloc moz_ldap_x_calloc | +#define ldap_x_calloc moz_ldap_x_calloc | ||||
+#define ldap_x_free moz_ldap_x_free | +#define ldap_x_free moz_ldap_x_free | ||||
+#define ldap_x_hostlist_first moz_ldap_x_hostlist_first | +#define ldap_x_hostlist_first moz_ldap_x_hostlist_first | ||||
+#define ldap_x_hostlist_next moz_ldap_x_hostlist_next | +#define ldap_x_hostlist_next moz_ldap_x_hostlist_next | ||||
+#define ldap_x_hostlist_statusfree moz_ldap_x_hostlist_statusfree | +#define ldap_x_hostlist_statusfree moz_ldap_x_hostlist_statusfree | ||||
+#define ldap_x_malloc moz_ldap_x_malloc | +#define ldap_x_malloc moz_ldap_x_malloc | ||||
+#define ldap_x_realloc moz_ldap_x_realloc | +#define ldap_x_realloc moz_ldap_x_realloc | ||||
+ | + | ||||
/* Standard LDAP API functions and declarations */ | /* Standard LDAP API functions and declarations */ | ||||
#include "ldap-standard.h" | #include "ldap-standard.h" | ||||