]> git.ipfire.org Git - thirdparty/zstd.git/commitdiff
Merge branch 'dev' into named_pipes
authorBimba Shrestha <bimbashrestha@fb.com>
Tue, 29 Oct 2019 05:17:13 +0000 (01:17 -0400)
committerGitHub <noreply@github.com>
Tue, 29 Oct 2019 05:17:13 +0000 (01:17 -0400)
1  2 
programs/fileio.c
programs/util.h
tests/playTests.sh

index 8824e3353db634dfa4902e009531c4a66ee80af0,828878c6a6a0023b0b9bc39ba1fe23323736abd5..4b5a47ecc68fed844085a92bb7c53fef4ccafe0f
@@@ -520,13 -520,7 +520,11 @@@ static FILE* FIO_openSrcFile(const char
          return NULL;
      }
  
 -    if (!UTIL_isRegularFile(srcFileName) && !UTIL_isFIFO(srcFileName)) {
 +    if (!UTIL_isRegularFile(srcFileName)
 +#ifndef _MSC_VER
 +        && !UTIL_isFIFO(srcFileName)
 +#endif /* _MSC_VER */
 +    ) {
          DISPLAYLEVEL(1, "zstd: %s is not a regular file -- ignored \n",
                          srcFileName);
          return NULL;
diff --cc programs/util.h
index 9fa7e2bd88c0b7d75fb95f35131a223d6f248151,71ba0d4fc3262c1705c3b2e06e93ccb7e6a4782b..063a8816e00dd2b3230c2ae69eafe09d5b21ca68
@@@ -136,10 -136,7 +136,9 @@@ int UTIL_getFileStat(const char* infile
  int UTIL_isSameFile(const char* file1, const char* file2);
  int UTIL_compareStr(const void *p1, const void *p2);
  
 +#ifndef _MSC_VER
  U32 UTIL_isFIFO(const char* infilename);
 +#endif
  U32 UTIL_isLink(const char* infilename);
  #define UTIL_FILESIZE_UNKNOWN  ((U64)(-1))
  U64 UTIL_getFileSize(const char* infilename);
Simple merge