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

# Conflicts:
#	programs/fileio.c

diff --cc programs/fileio.c
index 9f1560b4334ba9053e393693c952334024df7d01,b2998ea12a3d92072d3f3c965268cfed92dfa6dd..ca83db6f08c6fcb777294d02e7f032fd014d9508
--- 1/programs/fileio.c
--- 2/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);