From: Bruno Haible Date: Sun, 13 May 2018 22:27:43 +0000 (+0200) Subject: posix_spawn: Fix compilation error on Android. X-Git-Tag: v1.0~5599 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=b62668cbd75a986bfd99a1ed8fb40ff84507e55d;p=gnulib.git posix_spawn: Fix compilation error on Android. * lib/spawn.in.h (posix_spawnattr_t): Consider also the case HAVE_POSIX_SPAWNATTR_T = 1 && HAVE_POSIX_SPAWN = 0. (posix_spawn_file_actions_t): Consider also the case HAVE_POSIX_SPAWN_FILE_ACTIONS_T = 1 && HAVE_POSIX_SPAWN = 0. --- diff --git a/ChangeLog b/ChangeLog index a0bc2f5359..30e0ab0dd3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2018-05-13 Bruno Haible + + posix_spawn: Fix compilation error on Android. + * lib/spawn.in.h (posix_spawnattr_t): Consider also the case + HAVE_POSIX_SPAWNATTR_T = 1 && HAVE_POSIX_SPAWN = 0. + (posix_spawn_file_actions_t): Consider also the case + HAVE_POSIX_SPAWN_FILE_ACTIONS_T = 1 && HAVE_POSIX_SPAWN = 0. + 2018-05-13 Bruno Haible tsearch: Move from K&R C to ANSI C. diff --git a/lib/spawn.in.h b/lib/spawn.in.h index b0dfcb5e65..a606176523 100644 --- a/lib/spawn.in.h +++ b/lib/spawn.in.h @@ -79,10 +79,10 @@ /* Data structure to contain attributes for thread creation. */ -#if @REPLACE_POSIX_SPAWN@ +#if @REPLACE_POSIX_SPAWN@ || (@HAVE_POSIX_SPAWNATTR_T@ && !@HAVE_POSIX_SPAWN@) # define posix_spawnattr_t rpl_posix_spawnattr_t #endif -#if @REPLACE_POSIX_SPAWN@ || !@HAVE_POSIX_SPAWNATTR_T@ +#if @REPLACE_POSIX_SPAWN@ || !@HAVE_POSIX_SPAWNATTR_T@ || !@HAVE_POSIX_SPAWN@ # if !GNULIB_defined_posix_spawnattr_t typedef struct { @@ -101,10 +101,10 @@ typedef struct /* Data structure to contain information about the actions to be performed in the new process with respect to file descriptors. */ -#if @REPLACE_POSIX_SPAWN@ +#if @REPLACE_POSIX_SPAWN@ || (@HAVE_POSIX_SPAWN_FILE_ACTIONS_T@ && !@HAVE_POSIX_SPAWN@) # define posix_spawn_file_actions_t rpl_posix_spawn_file_actions_t #endif -#if @REPLACE_POSIX_SPAWN@ || !@HAVE_POSIX_SPAWN_FILE_ACTIONS_T@ +#if @REPLACE_POSIX_SPAWN@ || !@HAVE_POSIX_SPAWN_FILE_ACTIONS_T@ || !@HAVE_POSIX_SPAWN@ # if !GNULIB_defined_posix_spawn_file_actions_t typedef struct {