summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2002-05-09 04:11:18 +0000
committerGerald Carter <jerry@samba.org>2002-05-09 04:11:18 +0000
commit12ad4d8580285f3fb6bc4c3596cd8a086dfa2d3d (patch)
tree57228f6feed3e544ca7f14eb7f166c05bfc9df0f
parent4db4e95ab2140e179d0f15ad390b7a994b6642f2 (diff)
downloadsamba-12ad4d8580285f3fb6bc4c3596cd8a086dfa2d3d.tar.gz
samba-12ad4d8580285f3fb6bc4c3596cd8a086dfa2d3d.tar.bz2
samba-12ad4d8580285f3fb6bc4c3596cd8a086dfa2d3d.zip
HP-UX 10.20 compiles fixes from SAMBA_2_2
(This used to be commit ddc0f556305fc12fc27ce89e01e00f98feb7d6c8)
-rw-r--r--source3/nsswitch/hp_nss_common.h4
-rw-r--r--source3/nsswitch/nss.h2
2 files changed, 5 insertions, 1 deletions
diff --git a/source3/nsswitch/hp_nss_common.h b/source3/nsswitch/hp_nss_common.h
index 5f39e9abb0..5bd5374182 100644
--- a/source3/nsswitch/hp_nss_common.h
+++ b/source3/nsswitch/hp_nss_common.h
@@ -23,8 +23,12 @@
Boston, MA 02111-1307, USA.
*/
+#ifdef HAVE_SYNCH_H
#include <synch.h>
+#endif
+#ifdef HAVE_PTHREAD_H
#include <pthread.h>
+#endif
typedef enum {
NSS_SUCCESS,
diff --git a/source3/nsswitch/nss.h b/source3/nsswitch/nss.h
index e021b013b5..d83a5e237e 100644
--- a/source3/nsswitch/nss.h
+++ b/source3/nsswitch/nss.h
@@ -72,7 +72,7 @@ typedef enum
#define NSD_MEM_VOLATILE 1
#define NSD_MEM_DYNAMIC 2
-#elif defined(HPUX)
+#elif defined(HPUX) && defined(HAVE_NSSWITCH_H)
/* HP-UX 11 */
#include "nsswitch/hp_nss_common.h"