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

diff --git a/include/lutil_md5.h b/include/lutil_md5.h
index e3fa6170894706aebd3fae633c565fcf0f1ec326..fb31443e9f60f2dfd4d6f7189f7af6d131f769b1 100644 (file)
--- 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 963545f5d6f0ba86860cf590386603bb84e0717b..165c9ed11df3490988b0bfea4f32d1b995582c0f 100644 (file)
--- 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];