Merge branch 'dev' into newFormats

Fixed conflicts in zstdmt_compress.c

diff --cc lib/common/zstd_internal.h
Simple merge

diff --cc lib/compress/zstd_compress.c
Simple merge

diff --cc lib/compress/zstdmt_compress.c
index 6c91d482e8b3a32e2f9082201a284a62d094d707,3bdb98e2ef42d7a96869d749db0e3d78729ab5c9..b15bf05afe8fdb13c8cb248568cfeb48d09147bd
--- 1/lib/compress/zstdmt_compress.c
--- 2/lib/compress/zstdmt_compress.c
+++ b/lib/compress/zstdmt_compress.c
@@@ -53,19 -53,17 +53,19 @@@ static unsigned long long GetCurrentClo
  }
  
  #define MUTEX_WAIT_TIME_DLEVEL 6
- #define PTHREAD_MUTEX_LOCK(mutex) {               \
 -#define ZSTD_PTHREAD_MUTEX_LOCK(mutex) {               \
 -    if (ZSTD_DEBUG>=MUTEX_WAIT_TIME_DLEVEL) {   \
++#define ZSTD_PTHREAD_MUTEX_LOCK(mutex) {          \
 +    if (ZSTD_DEBUG >= MUTEX_WAIT_TIME_DLEVEL) {   \
          unsigned long long const beforeTime = GetCurrentClockTimeMicroseconds(); \
-         pthread_mutex_lock(mutex);                \
 -        ZSTD_pthread_mutex_lock(mutex);                \
++        ZSTD_pthread_mutex_lock(mutex);           \
          {   unsigned long long const afterTime = GetCurrentClockTimeMicroseconds(); \
              unsigned long long const elapsedTime = (afterTime-beforeTime); \
              if (elapsedTime > 1000) {  /* or whatever threshold you like; I'm using 1 millisecond here */ \
                  DEBUGLOG(MUTEX_WAIT_TIME_DLEVEL, "Thread took %llu microseconds to acquire mutex %s \n", \
                     elapsedTime, #mutex);          \
          }   }                                     \
 -    } else ZSTD_pthread_mutex_lock(mutex);             \
 +    } else {                                      \
-         pthread_mutex_lock(mutex);                \
++        ZSTD_pthread_mutex_lock(mutex);           \
 +    }                                             \
  }
  
  #else

diff --cc lib/decompress/zstd_decompress.c
Simple merge

diff --cc lib/zstd.h
Simple merge

diff --cc programs/fileio.c
Simple merge

diff --cc tests/playTests.sh
Simple merge

diff --cc tests/zstreamtest.c
Simple merge