diff options
author | NIIBE Yutaka <[email protected]> | 2022-11-04 05:41:28 +0000 |
---|---|---|
committer | NIIBE Yutaka <[email protected]> | 2022-11-04 05:41:28 +0000 |
commit | 5d30adb5ad376a07576b258b9395adadf5576867 (patch) | |
tree | 3639ded8cf8b7e237e3baeb9d5573fdfe0edb12a /src/mkheader.c | |
parent | spawn: Fix spawn_cb of gpgrt_spawn_process_fd. (diff) | |
download | libgpg-error-5d30adb5ad376a07576b258b9395adadf5576867.tar.gz libgpg-error-5d30adb5ad376a07576b258b9395adadf5576867.zip |
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 <[email protected]>
Diffstat (limited to 'src/mkheader.c')
-rw-r--r-- | src/mkheader.c | 27 |
1 files changed, 11 insertions, 16 deletions
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 <sys/types.h>\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 <stdint.h>\n", stdout); - stdint_h_included = 1; + if (!sys_types_h_included) + { + fputs ("#include <sys/types.h>\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")) |