From: Yann Collet <Cyan4973@users.noreply.github.com>
Date: Tue, 15 Aug 2017 19:37:28 +0000 (-0700)
Subject: Merge pull request #796 from terrelln/is-error
X-Git-Tag: v1.3.1^2~11^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f9e659071546b209d36bdeb585c7097d1acd663e;p=thirdparty%2Fzstd.git

Merge pull request #796 from terrelln/is-error

[FSE][HUF] Inline error checks
---

f9e659071546b209d36bdeb585c7097d1acd663e
diff --cc lib/common/fse_decompress.c
index 6bcc6b20a,1a1977989..8e3f0035f
--- a/lib/common/fse_decompress.c
+++ b/lib/common/fse_decompress.c
@@@ -39,9 -60,9 +39,10 @@@
  #include <stdlib.h>     /* malloc, free, qsort */
  #include <string.h>     /* memcpy, memset */
  #include "bitstream.h"
 +#include "compiler.h"
  #define FSE_STATIC_LINKING_ONLY
  #include "fse.h"
+ #include "error_private.h"
  
  
  /* **************************************************************
diff --cc lib/compress/fse_compress.c
index 50a130250,05ccc3fd5..cc9fa7351
--- a/lib/compress/fse_compress.c
+++ b/lib/compress/fse_compress.c
@@@ -39,9 -60,9 +39,10 @@@
  #include <string.h>     /* memcpy, memset */
  #include <stdio.h>      /* printf (debug) */
  #include "bitstream.h"
 +#include "compiler.h"
  #define FSE_STATIC_LINKING_ONLY
  #include "fse.h"
+ #include "error_private.h"
  
  
  /* **************************************************************