From d569bb029983cff947dce704e6f830276204c13f Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 11 Aug 2018 13:57:20 +0200 Subject: patch 8.1.0268: file type checking has too many #ifdef Problem: File type checking has too many #ifdef. Solution: Always define the S_IF macros. (Ken Takata, closes #3306) --- src/if_cscope.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'src/if_cscope.c') diff --git a/src/if_cscope.c b/src/if_cscope.c index d621a146b3..186179ca05 100644 --- a/src/if_cscope.c +++ b/src/if_cscope.c @@ -550,7 +550,7 @@ staterr: } /* if filename is a directory, append the cscope database name to it */ - if ((statbuf.st_mode & S_IFMT) == S_IFDIR) + if (S_ISDIR(statbuf.st_mode)) { fname2 = (char *)alloc((unsigned)(strlen(CSCOPE_DBFILE) + strlen(fname) + 2)); if (fname2 == NULL) @@ -581,12 +581,7 @@ staterr: i = cs_insert_filelist(fname2, ppath, flags, &statbuf); } -#if defined(UNIX) else if (S_ISREG(statbuf.st_mode) || S_ISLNK(statbuf.st_mode)) -#else - /* WIN32 - substitute define S_ISREG from os_unix.h */ - else if (((statbuf.st_mode) & S_IFMT) == S_IFREG) -#endif { i = cs_insert_filelist(fname, ppath, flags, &statbuf); } -- cgit v1.2.3