Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-14 14:03:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use standard __CYGWIN__ define for Cygwin detection

Browse source 
(cherry picked from commit 462cb6044c)
This commit is contained in:
Mahmoud Al-Qudsi 2019-01-21 20:06:16 -06:00
parent 91ac0f1b18
commit a5ef1e395e
3 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cmake/ConfigureChecks.cmake
View file

@ -19,11 +19,6 @@ if (CMAKE_HOST_SYSTEM_VERSION MATCHES ".*-Microsoft")
SET(WSL 1) SET(WSL 1)
endif() endif()
# Detect Cygwin.
if (CMAKE_SYSTEM_NAME MATCHES "CYGWIN_NT.*")
SET(CYGWIN 1)
endif()
# Set up the config.h file. # Set up the config.h file.
SET(PACKAGE_NAME "fish") SET(PACKAGE_NAME "fish")
SET(PACKAGE_TARNAME "fish") SET(PACKAGE_TARNAME "fish")

3
config_cmake.h.in
View file

@ -4,9 +4,6 @@
/* Define to 1 if compiled on WSL */ /* Define to 1 if compiled on WSL */
#cmakedefine WSL 1 #cmakedefine WSL 1
/* Define to 1 if complied under Cygwin */
#cmakedefine CYGWIN 1
/* Define to 1 if you have the `clock_gettime' function. */ /* Define to 1 if you have the `clock_gettime' function. */
#cmakedefine HAVE_CLOCK_GETTIME 1 #cmakedefine HAVE_CLOCK_GETTIME 1

2
src/common.h
View file

@ -978,7 +978,7 @@ constexpr bool is_windows_subsystem_for_linux() {
/// Detect if we are running under Cygwin or Cgywin64 /// Detect if we are running under Cygwin or Cgywin64
constexpr bool is_cygwin() { constexpr bool is_cygwin() {
#ifdef CYGWIN #ifdef __CYGWIN__
return true; return true;
#else #else
return false; return false;