From 5d30adb5ad376a07576b258b9395adadf5576867 Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Fri, 4 Nov 2022 14:41:28 +0900 Subject: spawn: Introduce gpgrt_process_t and use it for spawn API. * configure.ac (AC_FUNC_FORK): No use. * src/gpg-error.h.in (@define:gpgrt_process_t@): New. (@define:pid_t@): Remove. (gpgrt_spawn_process, gpgrt_spawn_process_fd): Use gpgrt_process_t. (gpgrt_wait_process, gpgrt_wait_processes): Likewise. (gpgrt_kill_process, gpgrt_release_process): Likewise. * src/gpgrt-int.h (_gpgrt_spawn_process): Likewise. (_gpgrt_spawn_process_fd): Likewise. (_gpgrt_wait_process, _gpgrt_wait_processes): Likewise. (_gpgrt_kill_process, _gpgrt_release_process): Likewise. * src/mkheader.c (write_special): Handle @define:gpgrt_process_t@. Remove handling of @define:pid_t@. * src/spawn-posix.c (_gpgrt_spawn_process): Use gpgrt_process_t. (_gpgrt_spawn_process_fd): Likewise. (_gpgrt_wait_process, _gpgrt_wait_processes): Likewise. (_gpgrt_kill_process, _gpgrt_release_process): Likewise. * src/spawn-w32.c (_gpgrt_spawn_process): Use gpgrt_process_t. (_gpgrt_spawn_process_fd): Likewise. (_gpgrt_wait_process, _gpgrt_wait_processes): Likewise. (_gpgrt_kill_process, _gpgrt_release_process): Likewise. -- GnuPG-bug-id: 6249 Signed-off-by: NIIBE Yutaka --- src/mkheader.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) (limited to 'src/mkheader.c') diff --git a/src/mkheader.c b/src/mkheader.c index e05dafd..8fbfbd6 100644 --- a/src/mkheader.c +++ b/src/mkheader.c @@ -570,28 +570,23 @@ write_special (const char *fname, int lnr, const char *tag) else fputs ("int", stdout); } - else if (!strcmp (tag, "define:pid_t")) + else if (!strcmp (tag, "define:gpgrt_process_t")) { - if (have_sys_types_h) + if (have_w32_system || have_w64_system) { - if (!sys_types_h_included) - { - fputs ("#include \n", stdout); - sys_types_h_included = 1; - } + fputs ("typedef void *gpgrt_process_t;\n", stdout); } - else if (have_w64_system) + else { - if (!stdint_h_included && have_stdint_h) + if (have_sys_types_h) { - fputs ("#include \n", stdout); - stdint_h_included = 1; + if (!sys_types_h_included) + { + fputs ("#include \n", stdout); + sys_types_h_included = 1; + } } - fputs ("typedef int64_t pid_t\n", stdout); - } - else - { - fputs ("typedef int pid_t\n", stdout); + fputs ("typedef pid_t gpgrt_process_t;\n", stdout); } } else if (!strcmp (tag, "include:err-sources")) -- cgit v1.2.3