Merge branch 'dev' of github.com:facebook/zstd into dev

This commit is contained in:
Yann Collet committed 2016-12-21 16:44:24 +01:00
commit 8333106b8a
10 files changed
+227 -126

No files matched your search

+11 -1
View File
@@ -8,10 +8,20 @@
*/
/* **************************************
* Compiler Warnings
****************************************/
#ifdef _MSC_VER
# pragma warning(disable : 4127) /* disable: C4127: conditional expression is constant */
#endif
/* *************************************
* Includes
***************************************/
#include "util.h" /* Compiler options, UTIL_GetFileSize, UTIL_sleep */
#include "platform.h" /* Large Files support */
#include "util.h" /* UTIL_getFileSize, UTIL_sleep */
#include <stdlib.h> /* malloc, free */
#include <string.h> /* memset */
#include <stdio.h> /* fprintf, fopen, ftello64 */