From: Bimba Shrestha <bimbashrestha@fb.com>
Date: Tue, 29 Oct 2019 05:17:13 +0000 (-0400)
Subject: Merge branch 'dev' into named_pipes
X-Git-Tag: v1.4.4~1^2~3^2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da73b11b1466a9d95ef5aca570143bb4af537dd1;p=thirdparty%2Fzstd.git

Merge branch 'dev' into named_pipes
---

da73b11b1466a9d95ef5aca570143bb4af537dd1
diff --cc programs/fileio.c
index 8824e3353,828878c6a..4b5a47ecc
--- a/programs/fileio.c
+++ b/programs/fileio.c
@@@ -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 9fa7e2bd8,71ba0d4fc..063a8816e
--- a/programs/util.h
+++ b/programs/util.h
@@@ -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);