diff options
| author | Marcus Brinkmann <[email protected]> | 2011-02-02 13:38:15 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <[email protected]> | 2011-02-02 13:38:15 +0000 |
| commit | 6d965377544cf369be6df9af9c92f66c73bbfbb7 (patch) | |
| tree | b7cdd0d29a2ce9b4745e7cb279fc0c1a75372c90 | |
| parent | Extend system hooks table by socket and connect functions. (diff) | |
| download | libassuan-6d965377544cf369be6df9af9c92f66c73bbfbb7.tar.gz libassuan-6d965377544cf369be6df9af9c92f66c73bbfbb7.zip | |
Fix C++ users.
2011-02-02 Marcus Brinkmann <[email protected]>
* assuan.h.in: Replace namespace by _namespace.
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/assuan.h.in | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 7f0d32f..80ef2a0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,4 +1,8 @@ -2011-02-02 Marcus Brinkmann <[email protected]> +2011-02-02 Marcus Brinkmann <[email protected]> + + * assuan.h.in: Replace namespace by _namespace. + +2011-02-02 Marcus Brinkmann <[email protected]> * assuan-defs.h (_assuan_socket, _assuan_connect): New prototypes. * assuan.h.in (ASSUAN_SYSTEM_HOOKS_VERSION): Bumped to 2. @@ -10,6 +14,7 @@ _assuan_sock_connect. (libassuan.def, libassuan.vers): Add __assuan_socket and __assuan_connect. + * system.c (_assuan_system_hooks_copy): Initialize destination from system hooks, so we don't get any NULL pointers if there is a version mismatch. Support version 2 of the system hook structure. diff --git a/src/assuan.h.in b/src/assuan.h.in index baf5594..9a70c56 100644 --- a/src/assuan.h.in +++ b/src/assuan.h.in @@ -245,7 +245,7 @@ struct assuan_system_hooks int action, int *status, int options); int (*socketpair) (assuan_context_t ctx, int _namespace, int style, int protocol, assuan_fd_t filedes[2]); - int (*socket) (assuan_context_t ctx, int namespace, int style, int protocol); + int (*socket) (assuan_context_t ctx, int _namespace, int style, int protocol); int (*connect) (assuan_context_t ctx, int sock, struct sockaddr *addr, socklen_t length); }; typedef struct assuan_system_hooks *assuan_system_hooks_t; |