From: Bimba Shrestha <bimbashrestha@fb.com>
Date: Fri, 25 Oct 2019 22:43:41 +0000 (-0700)
Subject: Merge branch 'master' of https://github.com/bimbashrestha/zstd into named_pipes
X-Git-Tag: v1.4.4~1^2~3^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e59d51991f9522d19e6efee8009dc3986ce3464;p=thirdparty%2Fzstd.git

Merge branch 'master' of https://github.com/bimbashrestha/zstd into named_pipes
---

5e59d51991f9522d19e6efee8009dc3986ce3464
diff --cc programs/util.h
index e79834693,c73f7e9b0..9fa7e2bd8
--- a/programs/util.h
+++ b/programs/util.h
@@@ -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);