From 25066fad5e5d06be599f6da604fceeb186f84232 Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Tue, 8 Dec 2009 20:52:28 +0000 Subject: 2009-12-08 Marcus Brinkmann * assuan.h (struct assuan_system_hooks): Don't use "namespace" as argument name in declaration (C++ keyword). --- src/ChangeLog | 3 +++ src/assuan.h | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) 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 + * 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; -- cgit v1.2.3