fixed datagen

dev
Yann Collet 2016-05-09 12:28:20 +02:00
parent ceca200c77
commit d782890576
2 changed files with 2 additions and 23 deletions

3
NEWS
View File

@ -1,6 +1,7 @@
v0.6.1 v0.6.1
Fixed : Legacy codec v0.5 compatible with dictionary decompression Fixed : Legacy codec v0.5 compatible with dictionary decompression
Fixed : Decoder corruption error (#173) Fixed : Decoder corruption error (#173)
New : midipix support
v0.6.0 v0.6.0
Stronger high compression modes, thanks to Przemyslaw Skibinski Stronger high compression modes, thanks to Przemyslaw Skibinski
@ -99,7 +100,7 @@ frame concatenation support
v0.1.1 v0.1.1
fix compression bug fix compression bug
detects write-flush errors detects write-flush errors
git@github.com:Cyan4973/zstd.git
v0.1.0 v0.1.0
first release first release

View File

@ -29,29 +29,7 @@
#include <stdlib.h> /* malloc */ #include <stdlib.h> /* malloc */
#include <stdio.h> /* FILE, fwrite */ #include <stdio.h> /* FILE, fwrite */
#include <string.h> /* memcpy */ #include <string.h> /* memcpy */
<<<<<<< HEAD
#include "mem.h" #include "mem.h"
=======
/*-************************************
* Basic Types
**************************************/
#if !defined (__VMS) && ( defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */ )
# include <stdint.h>
typedef uint8_t BYTE;
typedef uint16_t U16;
typedef uint32_t U32;
typedef int32_t S32;
typedef uint64_t U64;
#else
typedef unsigned char BYTE;
typedef unsigned short U16;
typedef unsigned int U32;
typedef signed int S32;
typedef unsigned long long U64;
#endif
>>>>>>> 59b6ba767710823fa688ff1f4b7ea443567f0b27
/*-************************************ /*-************************************