From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 4 Jun 2007 08:01:48 +0000 (+0000)
Subject: r23328: don't typedef ber_tag_t when it's already done by openldap
X-Git-Tag: samba-4.0.0alpha6~801^2~5705
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a02badcd4effd3b8d34a77868b24987ac6a7415d;p=thirdparty%2Fsamba.git

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)
---

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 0e90004bdbc..9c7b3d1c1f6 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