From: Przemyslaw Skibinski <inikep@gmail.com>
Date: Mon, 13 Feb 2017 20:35:39 +0000 (+0100)
Subject: Resolve conflict with branch 'refs/remotes/facebook/dev'
X-Git-Tag: v1.1.4~1^2~65^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=48466b36e8ffa54829bd09f0216b4d6dac149730;p=thirdparty%2Fzstd.git

Resolve conflict with branch 'refs/remotes/facebook/dev'

# Conflicts:
#	programs/fileio.c
---

48466b36e8ffa54829bd09f0216b4d6dac149730
diff --cc programs/fileio.c
index 9f1560b43,b2998ea12..ca83db6f0
--- a/programs/fileio.c
+++ b/programs/fileio.c
@@@ -553,9 -499,10 +579,10 @@@ int FIO_compressFilename(const char* ds
  {
      clock_t const start = clock();
      U64 const srcSize = UTIL_getFileSize(srcFileName);
+     int const regFile = UTIL_isRegFile(srcFileName);
  
-     cRess_t const ress = FIO_createCResources(dictFileName, compressionLevel, srcSize, comprParams);
+     cRess_t const ress = FIO_createCResources(dictFileName, compressionLevel, srcSize, regFile, comprParams);
 -    int const result = FIO_compressFilename_dstFile(ress, dstFileName, srcFileName);
 +    int const result = FIO_compressFilename_dstFile(ress, dstFileName, srcFileName, compressionLevel);
  
      double const seconds = (double)(clock() - start) / CLOCKS_PER_SEC;
      DISPLAYLEVEL(4, "Completed in %.2f sec \n", seconds);