Author: metze Date: 2007-06-04 08:02:14 +0000 (Mon, 04 Jun 2007) New Revision: 23329
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23329 Log: merge from SAMBA_3_0: 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 Modified: branches/SAMBA_3_0_26/source/include/includes.h Changeset: Modified: branches/SAMBA_3_0_26/source/include/includes.h =================================================================== --- branches/SAMBA_3_0_26/source/include/includes.h 2007-06-04 08:01:48 UTC (rev 23328) +++ branches/SAMBA_3_0_26/source/include/includes.h 2007-06-04 08:02:14 UTC (rev 23329) @@ -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
