fix : inlining difficulties with gcc 4.6 (travis)

diff --git a/lib/zstd_compress.c b/lib/zstd_compress.c
index 7f8385b376563f8c88a1dce64202cada8f9cc8c1..6ca31895e4b3e53871758642848a26c1a611bc65 100644 (file)
--- a/lib/zstd_compress.c
+++ b/lib/zstd_compress.c
@@ -1370,8 +1370,7 @@ size_t ZSTD_insertBtAndFindBestMatch (
             if (matchIndex <= btLow) { largerPtr=&dummy32; break; }   /* beyond tree size, stop the search */
             largerPtr = nextPtr;
             matchIndex = nextPtr[0];
-        }
-    }
+    }   }
 
     *smallerPtr = *largerPtr = 0;
 
@@ -1394,7 +1393,7 @@ size_t ZSTD_BtFindBestMatch (
 }
 
 
-FORCE_INLINE size_t ZSTD_BtFindBestMatch_selectMLS (
+static size_t ZSTD_BtFindBestMatch_selectMLS (
                         ZSTD_CCtx* zc,   /* Index table will be updated */
                         const BYTE* ip, const BYTE* const iLimit,
                         size_t* offsetPtr,
@@ -1661,7 +1660,7 @@ void ZSTD_compressBlock_lazy_generic(ZSTD_CCtx* ctx,
             break;  /* nothing found : store previous solution */
         }
 
-        /* catch up */
+       /* catch up */
         if (offset) {
             while ((start>anchor) && (start>base+offset) && (start[-1] == start[-1-offset]))   /* only search for offset within prefix */
                 { start--; matchLength++; }

diff --git a/lib/zstd_opt.c b/lib/zstd_opt.c
index 43ae8b5704a258465c5bef17bb8ea95b6aef6c96..3c1fbbe167bc1d494d8add61618a39171ef037dd 100644 (file)
--- a/lib/zstd_opt.c
+++ b/lib/zstd_opt.c
@@ -94,7 +94,7 @@ FORCE_INLINE U32 ZSTD_getPrice(seqStore_t* seqStorePtr, U32 litLength, const BYT
 {
     if (seqStorePtr->litSum > ZSTD_FREQ_THRESHOLD)
         return ZSTD_getLiteralPriceReal(seqStorePtr, litLength, literals) + ZSTD_getMatchPriceReal(seqStorePtr, offset, matchLength);
-
+    /* backup eval */
     return (litLength<<3) + ZSTD_highbit((U32)matchLength+1) + Offbits + ZSTD_highbit((U32)offset+1);
 }