From: Björn Jacke <bj@sernet.de>
Date: Thu, 10 Jun 2010 15:19:16 +0000 (+0200)
Subject: s3: fix build on HP-UX
X-Git-Tag: samba-3.5.16~5
X-Git-Url: http://git.samba.org/?p=samba.git;a=commitdiff_plain;h=96bf61ac6075bda4fbaac91a964ac5ac119a0dbf

s3: fix build on HP-UX

this struct member h_errno is not used in the HP-UX code paths, it was just
there because Solaris has it, too. As h_errno is a function call macro on HP-UX
when thread support is enabled we run into trouble here. Just commenting it out
should be okay as we don't use it anyway.
(cherry picked from commit ec94efb79d4516b09c7d1d93a4ff8ce0f7046f41)

Fix bug #9011 - Build on HP-UX broken.
(cherry picked from commit 9658d8e13dc045a338a7b1496a6cc3ce5ed0e704)
---

diff --git a/nsswitch/winbind_nss_hpux.h b/nsswitch/winbind_nss_hpux.h
index 40a352d4d3b..393c0a35dba 100644
--- a/nsswitch/winbind_nss_hpux.h
+++ b/nsswitch/winbind_nss_hpux.h
@@ -130,7 +130,12 @@ typedef struct nss_XbyY_args {
 
 	void *returnval;
 	int erange;
-	int h_errno;
+	/*
+	*  h_errno is defined as function call macro for multithreaded applications
+	*  in HP-UX. *this* h_errno is not used in the HP-UX codepath of our nss
+	*  modules, so let's simply comment it out here:
+	* int h_errno;
+	*/
 	nss_status_t status;
 } nss_XbyY_args_t;