summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2002-05-09 14:20:05 +0000
committerGerald Carter <jerry@samba.org>2002-05-09 14:20:05 +0000
commitf1554f0847971fca72e911e3774565166f2b07fe (patch)
tree9a64f7f9aefccd42ce2f7928d81ba2af4e6e3011
parent3de73897e7083520ac123b399cd823ce61a4d475 (diff)
downloadsamba-f1554f0847971fca72e911e3774565166f2b07fe.tar.gz
samba-f1554f0847971fca72e911e3774565166f2b07fe.tar.bz2
samba-f1554f0847971fca72e911e3774565166f2b07fe.zip
merge freom SAMBA_2_2
(This used to be commit 833fea47106444a4bcc0547c8bbb7d6d148fa1e7)
-rw-r--r--source3/nsswitch/winbind_nss_config.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/source3/nsswitch/winbind_nss_config.h b/source3/nsswitch/winbind_nss_config.h
index 0de63878be..b9c738211e 100644
--- a/source3/nsswitch/winbind_nss_config.h
+++ b/source3/nsswitch/winbind_nss_config.h
@@ -129,11 +129,15 @@ typedef int BOOL;
#endif
/* zero a structure */
+#ifndef ZERO_STRUCT
#define ZERO_STRUCT(x) memset((char *)&(x), 0, sizeof(x))
+#endif
/* zero a structure given a pointer to the structure */
+#ifndef ZERO_STRUCTP
#define ZERO_STRUCTP(x) { if ((x) != NULL) memset((char *)(x), 0, sizeof(*(x))); }
-
+#endif
+
/* Some systems (SCO) treat UNIX domain sockets as FIFOs */
#ifndef S_IFSOCK