aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS26
-rw-r--r--src/assuan.h.in6
2 files changed, 19 insertions, 13 deletions
diff --git a/NEWS b/NEWS
index ae9fb44..3957b56 100644
--- a/NEWS
+++ b/NEWS
@@ -1,23 +1,29 @@
Noteworthy changes in version 3.0.0 (unreleased) [C_/A_/R_]
------------------------------------------------
- * Windows support for sendfd/recvfd. [T6236]
+ * New function assuan_control. [T6625]
* New function assuan_sock_accept. [T5925]
- * Use of ASSUAN_SYSTEM_NPTH is deprecated. Instead, when you use
- nPTH, please use the gpgrt_set_syscall_clamp function from gpgrt
- library to set npth_unprotect/npth_protect. If it's really needed
- (to support running with old versions of libassuan), please define
- ASSUAN_REALLY_REQUIRE_OLD_WAY_OF_SYSTEM_NPTH before including
- <assuan.h>. [T5914]
+ * API change: For new code, which use with nPTH, please use
+ gpgrt_get_syscall_clamp and assuan_control, instead of the
+ system_hooks API. Use of ASSUAN_SYSTEM_NPTH is deprecated with new
+ API version 3. If it's really needed to keep using old
+ implementation of ASSUAN_SYSTEM_NPTH (together with new API version
+ 3), you need to change your your application code, to define
+ ASSUAN_REALLY_REQUIRE_V2_NPTH_SYSTEM_HOOKS before including
+ <assuan.h>. For an application which uses version 2 API
+ (NEED_LIBASSUAN_API=2 in its configure.ac), use of
+ ASSUAN_SYSTEM_NPTH is still supported. [T5914]
- * No support for WindowsCE, any more. [T6170]
+ * New functions assuan_pipe_wait_server_termination and
+ assuan_pipe_kill_server to support abstraction of process. [T6487]
+
+ * Windows support for sendfd/recvfd. [T6236]
* Implement timeout in assuan_sock_connect_byname. [T3302]
- * New functions assuan_pipe_wait_server_termination and
- assuan_pipe_kill_server to support abstraction of process. [T6487]
+ * No support for WindowsCE, any more. [T6170]
* Interface changes relative to the 3.0.0 release:
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/src/assuan.h.in b/src/assuan.h.in
index 14492ec..462ec37 100644
--- a/src/assuan.h.in
+++ b/src/assuan.h.in
@@ -566,11 +566,11 @@ assuan_pid_t __assuan_waitpid (assuan_context_t ctx, assuan_pid_t pid,
int nowait, int *status, int options);
#if defined(LIBASSUAN_API_REQUESTED) && LIBASSUAN_API_REQUESTED >= 3
-#defined ASSUAN_NO_GLOBAL_SYSTEM_HOOKS_ANY_MORE 1
+#defined ASSUAN_NO_NPTH_SYSTEM_HOOKS_ANY_MORE 1
#endif
-#if defined(ASSUAN_REALLY_REQUIRE_OLD_WAY_OF_SYSTEM_NPTH) \
- || !defined(ASSUAN_NO_GLOBAL_SYSTEM_HOOKS_ANY_MORE)
+#if defined(ASSUAN_REALLY_REQUIRE_V2_NPTH_SYSTEM_HOOKS) \
+ || !defined(ASSUAN_NO_NPTH_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) \