From 3a9964f4e096a030a2aac0a4a3688ba996715a27 Mon Sep 17 00:00:00 2001 From: albert-github Date: Sat, 15 Jun 2019 11:47:51 +0200 Subject: Cygwin should by default also have `CASE_SENS_NAMES=NO` Cygwin should by default also have `CASE_SENS_NAMES=NO` like is the case for the underlying Windows. In case of Cygwin the define `_WIN32` is not set so we also have to test for `__CYGWIN__` --- src/config.xml | 4 ++-- src/portable.cpp | 2 +- src/util.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/config.xml b/src/config.xml index 0bf34a8..f3b16a8 100644 --- a/src/config.xml +++ b/src/config.xml @@ -960,8 +960,8 @@ Go to the next section or return to the will only generate file names in lower-case letters. If set to \c YES, upper-case letters are also allowed. This is useful if you have classes or files whose names only differ in case and if your file system - supports case sensitive file names. Windows and Mac users are advised to set this - option to \c NO. + supports case sensitive file names. Windows (including Cygwin) ands + Mac users are advised to set this option to \c NO. ]]> diff --git a/src/portable.cpp b/src/portable.cpp index 3dccaed..6ee9927 100644 --- a/src/portable.cpp +++ b/src/portable.cpp @@ -396,7 +396,7 @@ const char *portable_commandExtension() bool portable_fileSystemIsCaseSensitive() { -#if defined(_WIN32) || defined(macintosh) || defined(__MACOSX__) || defined(__APPLE__) +#if defined(_WIN32) || defined(macintosh) || defined(__MACOSX__) || defined(__APPLE__) || defined(__CYGWIN__) return FALSE; #else return TRUE; diff --git a/src/util.cpp b/src/util.cpp index a6ae004..338b10c 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -5129,7 +5129,7 @@ FileDef *findFileDef(const FileNameDict *fnDict,const char *n,bool &ambig) if (fn->count()==1) { FileDef *fd = fn->getFirst(); -#if defined(_WIN32) || defined(__MACOSX__) // Windows or MacOSX +#if defined(_WIN32) || defined(__MACOSX__) || defined(__CYGWIN__) // Windows or MacOSX bool isSamePath = fd->getPath().right(path.length()).lower()==path.lower(); #else // Unix bool isSamePath = fd->getPath().right(path.length())==path; @@ -8138,7 +8138,7 @@ bool patternMatch(const QFileInfo &fi,const QStrList *patList) bool found = FALSE; // For Windows/Mac, always do the case insensitive match -#if defined(_WIN32) || defined(__MACOSX__) +#if defined(_WIN32) || defined(__MACOSX__) || defined(__CYGWIN__) caseSenseNames = FALSE; #endif -- cgit v0.12