diff options
| author | Marcus Brinkmann <mb@g10code.com> | 2009-12-08 20:52:28 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <mb@g10code.com> | 2009-12-08 20:52:28 +0000 |
| commit | 25066fad5e5d06be599f6da604fceeb186f84232 (patch) | |
| tree | 7ef20b19cc616254d5fd3b1b6418d1b00dbf1e0b | |
| parent | e7faad4905ad962b15aa846221a1431d1fb765e2 (diff) | |
| download | libassuan-25066fad5e5d06be599f6da604fceeb186f84232.tar.gz | |
2009-12-08 Marcus Brinkmann <marcus@g10code.de>
* assuan.h (struct assuan_system_hooks): Don't use "namespace" as
argument name in declaration (C++ keyword).
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/assuan.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index adb6c05..92c9d0b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2009-12-08 Marcus Brinkmann <marcus@g10code.de> + * assuan.h (struct assuan_system_hooks): Don't use "namespace" as + argument name in declaration (C++ keyword). + * client.c (assuan_client_read_response): Fix linelen. * assuan.h (ASSUAN_SPAWN_DETACHED): New macro. diff --git a/src/assuan.h b/src/assuan.h index 4886608..42194ec 100644 --- a/src/assuan.h +++ b/src/assuan.h @@ -293,7 +293,7 @@ struct assuan_system_hooks /* If action is 0, like waitpid. If action is 1, just release the PID? */ pid_t (*waitpid) (assuan_context_t ctx, pid_t pid, int action, int *status, int options); - int (*socketpair) (assuan_context_t ctx, int namespace, int style, + int (*socketpair) (assuan_context_t ctx, int _namespace, int style, int protocol, assuan_fd_t filedes[2]); }; typedef struct assuan_system_hooks *assuan_system_hooks_t; |