Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FISH_USE_POSIX_SPAWN and HAVE_SPAWN_H fixes #8097

Merged
merged 1 commit into from
Jul 1, 2021
Merged

FISH_USE_POSIX_SPAWN and HAVE_SPAWN_H fixes #8097

merged 1 commit into from
Jul 1, 2021

Conversation

evanmiller
Copy link
Contributor

Description

FISH_USE_POSIX_SPAWN is always defined, thanks to the lines

#ifndef FISH_USE_POSIX_SPAWN
#define FISH_USE_POSIX_SPAWN HAVE_SPAWN_H
#endif

So replace #ifdef with #if to fix compilation on platforms lacking spawn.h. Also make the spawn.h inclusion condition consistent across files.

TODOs:

  • Changes to fish usage are reflected in user documentation/manpages.
  • Tests have been added for regressions fixed
  • User-visible changes noted in CHANGELOG.rst

FISH_USE_POSIX_SPAWN is always defined, thanks to the line

   #define FISH_USE_POSIX_SPAWN HAVE_SPAWN_H

So replace #ifdef with #if to fix compilation on platforms lacking
spawn.h. Also make the spawn.h inclusion condition consistent across
files.
@faho
Copy link
Member

faho commented Jul 1, 2021

So replace #ifdef with #if to fix compilation on platforms lacking spawn.h

Which platforms are those?

@evanmiller
Copy link
Contributor Author

@faho I am currently attempting to compile on OSX 10.4 / PowerPC, via MacPorts. My understanding from the commit messages is that some versions of Android also lack spawn.h.

@faho
Copy link
Member

faho commented Jul 1, 2021

My understanding from the commit messages is that some versions of Android also lack spawn.h.

It works on termux with -landroid-spawn, we don't care about Android otherwise.

But anyway, this seems correct and passes CI elsewhere, so I'm merging.

@faho faho merged commit 23518e7 into fish-shell:master Jul 1, 2021
@faho faho added this to the fish 3.4.0 milestone Jul 1, 2021
@zanchey zanchey modified the milestones: fish 3.4.0, fish 3.3.1 Jul 4, 2021
@evanmiller evanmiller deleted the posix-spawn-fixes branch August 4, 2021 22:56
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Aug 8, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants