From: Kurt Zeilenga <kurt@openldap.org>
Date: Wed, 18 Nov 1998 05:09:05 +0000 (+0000)
Subject: Shouldn't have removed uint32's multiple defined protection...
X-Git-Tag: OPENLDAP_SLAPD_BACK_LDAP~1099
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f05554bddccc234f39ad32c1891f120da26263c7;p=openldap

Shouldn't have removed uint32's multiple defined protection...
---

diff --git a/include/lutil_md5.h b/include/lutil_md5.h
index e3fa617089..fb31443e9f 100644
--- a/include/lutil_md5.h
+++ b/include/lutil_md5.h
@@ -14,7 +14,9 @@ LDAP_BEGIN_DECL
    important.  ANSI guarantees that "unsigned long" will be big enough,
    and always using it seems to have few disadvantages.  */
 
+#ifndef LDAP_UINT32
 typedef LDAP_UINT4 uint32;
+#endif
 
 struct ldap_MD5Context {
 	uint32 buf[4];
diff --git a/include/lutil_sha1.h b/include/lutil_sha1.h
index 963545f5d6..165c9ed11d 100644
--- a/include/lutil_sha1.h
+++ b/include/lutil_sha1.h
@@ -15,7 +15,9 @@ LDAP_BEGIN_DECL
  * 100% Public Domain
  */
 
+#ifndef LDAP_UINT32
 typedef LDAP_UINT4 uint32;
+#endif
 
 typedef struct {
     uint32 state[5];