diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-02-05 16:39:28 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-02-05 16:39:28 +0100 |
| commit | 6d139ca4680abcbda5110f2f0886aa038ff62088 (patch) | |
| tree | 7d61db40fb058bcbf08ccd8e0dadc365b819371b /source4/lib/socket/connect.c | |
| parent | 4a9b3052caeb8bb144803b49dcfae82395172bc3 (diff) | |
| parent | afa960cbbcd609123d710c301e7a9a070c1fed70 (diff) | |
| download | samba-6d139ca4680abcbda5110f2f0886aa038ff62088.tar.gz samba-6d139ca4680abcbda5110f2f0886aa038ff62088.tar.bz2 samba-6d139ca4680abcbda5110f2f0886aa038ff62088.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Conflicts:
librpc/ndr.pc.in
Diffstat (limited to 'source4/lib/socket/connect.c')
| -rw-r--r-- | source4/lib/socket/connect.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/lib/socket/connect.c b/source4/lib/socket/connect.c index be15aa987b..b943de8c14 100644 --- a/source4/lib/socket/connect.c +++ b/source4/lib/socket/connect.c @@ -36,7 +36,7 @@ struct connect_state { static void socket_connect_handler(struct tevent_context *ev, struct tevent_fd *fde, - uint16_t flags, void *private); + uint16_t flags, void *private_data); /* call the real socket_connect() call, and setup event handler @@ -118,10 +118,10 @@ struct composite_context *socket_connect_send(struct socket_context *sock, */ static void socket_connect_handler(struct tevent_context *ev, struct tevent_fd *fde, - uint16_t flags, void *private) + uint16_t flags, void *private_data) { struct composite_context *result = - talloc_get_type(private, struct composite_context); + talloc_get_type(private_data, struct composite_context); struct connect_state *state = talloc_get_type(result->private_data, struct connect_state); |