]> git.ipfire.org Git - thirdparty/zstd.git/commitdiff
Merge pull request #1850 from bimbashrestha/named_pipes
authorYann Collet <Cyan4973@users.noreply.github.com>
Wed, 30 Oct 2019 19:18:58 +0000 (12:18 -0700)
committerGitHub <noreply@github.com>
Wed, 30 Oct 2019 19:18:58 +0000 (12:18 -0700)
Gating named pipe support on windows

1  2 
programs/fileio.c
programs/util.c
programs/util.h
programs/zstdcli.c
tests/playTests.sh

Simple merge
diff --cc programs/util.c
Simple merge
diff --cc programs/util.h
index 0d0642cb54d4f71bcac6089d546db97a3dd47d83,063a8816e00dd2b3230c2ae69eafe09d5b21ca68..1f524f2934ad8e1015fb472450f934e217d5b732
@@@ -134,10 -135,10 +134,12 @@@ U32 UTIL_isDirectory(const char* infile
  int UTIL_getFileStat(const char* infilename, stat_t* statbuf);
  int UTIL_isSameFile(const char* file1, const char* file2);
  int UTIL_compareStr(const void *p1, const void *p2);
 +int UTIL_isCompressedFile(const char* infilename, const char *extensionList[]);
 +const char* UTIL_getFileExtension(const char* infilename);
  
+ #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
Simple merge