diff options
| author | Jeremy Allison <jra@samba.org> | 2005-06-24 20:25:18 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:58:00 -0500 |
| commit | 19ca97a70f6b7b41d251eaa76e4d3c980c6eedff (patch) | |
| tree | 18d7d81e2c1aa7cf9325899b7e8fc90b41c14c8b /source3/nsswitch/winbindd.h | |
| parent | 8387af752f81e26f1c141f6053bf6d106f0af5eb (diff) | |
| download | samba-19ca97a70f6b7b41d251eaa76e4d3c980c6eedff.tar.gz samba-19ca97a70f6b7b41d251eaa76e4d3c980c6eedff.tar.bz2 samba-19ca97a70f6b7b41d251eaa76e4d3c980c6eedff.zip | |
r7882: Looks like a large patch - but what it actually does is make Samba
safe for using our headers and linking with C++ modules. Stops us
from using C++ reserved keywords in our code.
Jeremy
(This used to be commit 9506b8e145982b1160a2f0aee5c9b7a54980940a)
Diffstat (limited to 'source3/nsswitch/winbindd.h')
| -rw-r--r-- | source3/nsswitch/winbindd.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/nsswitch/winbindd.h b/source3/nsswitch/winbindd.h index d000168b1f..378120c80b 100644 --- a/source3/nsswitch/winbindd.h +++ b/source3/nsswitch/winbindd.h @@ -43,8 +43,8 @@ struct fd_event { void (*handler)(struct fd_event *fde, int flags); void *data; size_t length, done; - void (*finished)(void *private, BOOL success); - void *private; + void (*finished)(void *private_data, BOOL success); + void *private_data; }; struct winbindd_cli_state { @@ -163,7 +163,7 @@ struct winbindd_domain { /* Private data for the backends (used for connection cache) */ - void *private; + void *private_data; /* A working DC */ fstring dcname; |