]> git.ipfire.org Git - thirdparty/zstd.git/commitdiff
Merge branch 'master' of https://github.com/bimbashrestha/zstd into named_pipes
authorBimba Shrestha <bimbashrestha@fb.com>
Fri, 25 Oct 2019 22:43:41 +0000 (15:43 -0700)
committerBimba Shrestha <bimbashrestha@fb.com>
Fri, 25 Oct 2019 22:43:41 +0000 (15:43 -0700)
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 e79834693b579d04a6522769435df8f850d6a73f,c73f7e9b0f64c8cd88184bed688e93ec9399594f..9fa7e2bd88c0b7d75fb95f35131a223d6f248151
@@@ -134,11 -134,8 +134,12 @@@ int UTIL_setFileStat(const char* filena
  U32 UTIL_isDirectory(const char* infilename);
  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);
  
 +#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