Merge pull request #54 from t-mat/gc-issue/155
authorYann Collet <yann.collet.73@gmail.com>
Sun, 8 Mar 2015 18:06:17 +0000 (19:06 +0100)
committerYann Collet <yann.collet.73@gmail.com>
Sun, 8 Mar 2015 18:06:17 +0000 (19:06 +0100)
Gc issue/155

1  2 
programs/lz4cli.c
programs/lz4io.c
programs/lz4io.h

  /*****************************
  *  Constants
  ******************************/
+ #if defined(LZ4IO_ENABLE_SPARSE_FILE)
+ #  undef LZ4_VERSION
+ #  define LZ4_VERSION "EXPERIMENTAL_SPARSE_FILE"
+ #endif
  #define COMPRESSOR_NAME "LZ4 command line interface"
  #ifndef LZ4_VERSION
 -#  define LZ4_VERSION "r126"
 +#  define LZ4_VERSION "r128"
  #endif
  #define AUTHOR "Yann Collet"
  #define WELCOME_MESSAGE "*** %s %i-bits %s, by %s (%s) ***\n", COMPRESSOR_NAME, (int)(sizeof(void*)*8), LZ4_VERSION, AUTHOR, __DATE__
@@@ -279,9 -285,12 +288,12 @@@ int main(int argc, char** argv
      /* Init */
      programName = argv[0];
      LZ4IO_setOverwrite(0);
+ #if defined(LZ4IO_ENABLE_SPARSE_FILE)
+     LZ4IO_setSparseFile(0);
+ #endif /* LZ4IO_ENABLE_SPARSE_FILE */
      blockSize = LZ4IO_setBlockSizeID(LZ4_BLOCKSIZEID_DEFAULT);
  
 -    /* lz4cat behavior */
 +    /* lz4cat predefined behavior */
      if (!strcmp(programName, LZ4_CAT)) { decode=1; forceStdout=1; output_filename=stdoutmark; displayLevel=1; }
  
      /* command switches */
Simple merge
Simple merge