From: Howard Chu <hyc@openldap.org>
Date: Sat, 26 Feb 2005 03:00:30 +0000 (+0000)
Subject: Use #ifndef for SASL_VERSION_FULL, new Cyrus <sasl.h> defines it now
X-Git-Tag: OPENLDAP_REL_ENG_2_3_BP~126
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=7ac049786308c9350672338f9b30b381b878325f;p=openldap

Use #ifndef for SASL_VERSION_FULL, new Cyrus <sasl.h> defines it now
---

diff --git a/contrib/ldapsasl/ldapdb.c b/contrib/ldapsasl/ldapdb.c
index da52ec1fba..6217e12844 100644
--- a/contrib/ldapsasl/ldapdb.c
+++ b/contrib/ldapsasl/ldapdb.c
@@ -19,8 +19,10 @@
 #include "saslutil.h"
 #include "saslplug.h"
 
+#ifndef SASL_VERSION_FULL
 #define SASL_VERSION_FULL ((SASL_VERSION_MAJOR << 16) |\
 	(SASL_VERSION_MINOR << 8) |SASL_VERSION_STEP)
+#endif
 
 #include "plugin_common.h"