github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-27 03:13:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixup! Unify handling of BSD systems where applicable

Browse Source
This commit is contained in:
Mahmoud Al-Qudsi 2020-11-20 15:06:19 -06:00
parent 06f1b34553
commit be78e9dc28
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/common.cpp
View File

@ -34,12 +34,6 @@
#include <sys/utsname.h> #include <sys/utsname.h>
#endif #endif
#ifdef __BSD__
#include <sys/sysctl.h>
#elif defined(__APPLE__)
#include <mach-o/dyld.h>
#endif
#include <algorithm> #include <algorithm>
#include <atomic> #include <atomic>
#include <memory> // IWYU pragma: keep #include <memory> // IWYU pragma: keep
@ -61,6 +55,13 @@
#include "wildcard.h" #include "wildcard.h"
#include "wutil.h" // IWYU pragma: keep #include "wutil.h" // IWYU pragma: keep
// Keep after "common.h"
#ifdef __BSD__
#include <sys/sysctl.h>
#elif defined(__APPLE__)
#include <mach-o/dyld.h>
#endif
struct termios shell_modes; struct termios shell_modes;
/// This allows us to notice when we've forked. /// This allows us to notice when we've forked.