r23328: don't typedef ber_tag_t when it's already done by openldap

headers on HP-UX (lber_types.h defines _LBER_TYPES_H).

metze

diff --git a/source/include/includes.h b/source/include/includes.h
index 0e90004bdbce4d18d035d1bf74813f51786ac394..9c7b3d1c1f6353d5edc7a120de3686afd25b77b8 100644 (file)
--- a/source/include/includes.h
+++ b/source/include/includes.h
@@ -173,7 +173,7 @@
 
 #if HAVE_LBER_H
 #include <lber.h>
-#ifdef HPUX
+#if defined(HPUX) && !defined(_LBER_TYPES_H)
 /* Define ber_tag_t and ber_int_t for using
  * HP LDAP-UX Integration products' LDAP libraries.
 */
@@ -181,7 +181,7 @@
 typedef unsigned long ber_tag_t;
 typedef int ber_int_t;
 #endif
-#endif /* HPUX */
+#endif /* defined(HPUX) && !defined(_LBER_TYPES_H) */
 #ifndef LBER_USE_DER
 #define LBER_USE_DER 0x01
 #endif