diff options
| author | Stefan Metzmacher <metze@samba.org> | 2007-06-04 08:01:48 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:23:06 -0500 |
| commit | a02badcd4effd3b8d34a77868b24987ac6a7415d (patch) | |
| tree | ce5a446d38864f6e9aa47459a0aa466240e635e0 | |
| parent | 248a82c0f28a5e1df957726558b795cf98d29097 (diff) | |
| download | samba-a02badcd4effd3b8d34a77868b24987ac6a7415d.tar.gz samba-a02badcd4effd3b8d34a77868b24987ac6a7415d.tar.bz2 samba-a02badcd4effd3b8d34a77868b24987ac6a7415d.zip | |
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
(This used to be commit bd1b28dd3e47c2f244baba4a239b0d6dca57f2d2)
| -rw-r--r-- | source3/include/includes.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index 0e90004bdb..9c7b3d1c1f 100644 --- a/source3/include/includes.h +++ b/source3/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 |