diff options
| author | NIIBE Yutaka <[email protected]> | 2023-05-24 05:06:15 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2023-05-24 05:06:15 +0000 |
| commit | 8d83aea214a17c8fff32bfb90eaa9870ea9630e2 (patch) | |
| tree | 7b824cbf2141a41148a8c38cafe5ba65d5042a3e | |
| parent | doc: Update documentation for the method spawn and waitpid. (diff) | |
| download | libassuan-8d83aea214a17c8fff32bfb90eaa9870ea9630e2.tar.gz libassuan-8d83aea214a17c8fff32bfb90eaa9870ea9630e2.zip | |
Allow use of global system hooks with API version 2.
* src/libassuan.m4 (LIBASSUAN_API_REQUESTED): New.
* src/assuan.h.in (ASSUAN_NO_GLOBAL_SYSTEM_HOOKS_ANY_MORE): New.
(ASSUAN_SYSTEM_NPTH_IMPL, ASSUAN_SYSTEM_NPTH): Relax the condition.
Signed-off-by: NIIBE Yutaka <[email protected]>
| -rw-r--r-- | src/assuan.h.in | 7 | ||||
| -rw-r--r-- | src/libassuan.m4 | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/assuan.h.in b/src/assuan.h.in index 10917c9..30a243c 100644 --- a/src/assuan.h.in +++ b/src/assuan.h.in @@ -551,7 +551,12 @@ int __assuan_sendmsg (assuan_context_t ctx, assuan_fd_t fd, assuan_pid_t __assuan_waitpid (assuan_context_t ctx, assuan_pid_t pid, int nowait, int *status, int options); -#ifdef ASSUAN_REALLY_REQUIRE_OLD_WAY_OF_SYSTEM_NPTH +#if defined(LIBASSUAN_API_REQUESTED) && LIBASSUAN_API_REQUESTED >= 3 +#defined ASSUAN_NO_GLOBAL_SYSTEM_HOOKS_ANY_MORE 1 +#endif + +#if defined(ASSUAN_REALLY_REQUIRE_OLD_WAY_OF_SYSTEM_NPTH) \ + || !defined(ASSUAN_NO_GLOBAL_SYSTEM_HOOKS_ANY_MORE) /* Standard system hooks for nPth. */ #define ASSUAN_SYSTEM_NPTH_IMPL \ static void _assuan_npth_usleep (assuan_context_t ctx, unsigned int usec) \ diff --git a/src/libassuan.m4 b/src/libassuan.m4 index 79391bb..f9e2e4f 100644 --- a/src/libassuan.m4 +++ b/src/libassuan.m4 @@ -89,6 +89,7 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], if test $ok = yes; then AC_MSG_RESULT([yes ($libassuan_config_version)]) + AC_DEFINE(LIBASSUAN_API_REQUESTED, $req_libassuan_api, Requested API version for libassuan) else AC_MSG_RESULT(no) fi |