The branch, v3-5-test has been updated
via 9658d8e s3: fix build on HP-UX
from 6fa785d s3-vfs_gpfs: Fix bug #9003, posix acl on gpfs
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test
- Log -----------------------------------------------------------------
commit 9658d8e13dc045a338a7b1496a6cc3ce5ed0e704
Author: Björn Jacke <b...@sernet.de>
Date: Thu Jun 10 17:19:16 2010 +0200
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.
-----------------------------------------------------------------------
Summary of changes:
nsswitch/winbind_nss_hpux.h | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/nsswitch/winbind_nss_hpux.h b/nsswitch/winbind_nss_hpux.h
index 40a352d..393c0a3 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;
--
Samba Shared Repository
