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_misc.c | |
| 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_misc.c')
| -rw-r--r-- | source3/nsswitch/winbindd_misc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/nsswitch/winbindd_misc.c b/source3/nsswitch/winbindd_misc.c index 7a02c8f629..6f72a0e2c6 100644 --- a/source3/nsswitch/winbindd_misc.c +++ b/source3/nsswitch/winbindd_misc.c @@ -219,7 +219,7 @@ struct sequence_state { char *extra_data; }; -static void sequence_recv(void *private, BOOL success); +static void sequence_recv(void *private_data, BOOL success); void winbindd_show_sequence(struct winbindd_cli_state *state) { @@ -279,9 +279,9 @@ void winbindd_show_sequence(struct winbindd_cli_state *state) sequence_recv, seq); } -static void sequence_recv(void *private, BOOL success) +static void sequence_recv(void *private_data, BOOL success) { - struct sequence_state *state = private; + struct sequence_state *state = private_data; uint32 seq = DOM_SEQUENCE_NONE; if ((success) && (state->response->result == WINBINDD_OK)) @@ -345,7 +345,7 @@ struct domain_info_state { struct winbindd_cli_state *cli_state; }; -static void domain_info_init_recv(void *private, BOOL success); +static void domain_info_init_recv(void *private_data, BOOL success); void winbindd_domain_info(struct winbindd_cli_state *state) { @@ -400,9 +400,9 @@ void winbindd_domain_info(struct winbindd_cli_state *state) request_ok(state); } -static void domain_info_init_recv(void *private, BOOL success) +static void domain_info_init_recv(void *private_data, BOOL success) { - struct domain_info_state *istate = private; + struct domain_info_state *istate = private_data; struct winbindd_cli_state *state = istate->cli_state; struct winbindd_domain *domain = istate->domain; |