From 888c385a49619c67010606e060dab33472263e05 Mon Sep 17 00:00:00 2001
From: senhuang42 <senhuang96@fb.com>
Date: Mon, 7 Sep 2020 18:11:42 -0400
Subject: [PATCH] Change param name to ZSTDCLI_NUMTHREADS_DEFAULT

---
 programs/zstdcli.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/programs/zstdcli.c b/programs/zstdcli.c
index 6d8724a5d..abc37beff 100644
--- a/programs/zstdcli.c
+++ b/programs/zstdcli.c
@@ -16,15 +16,13 @@
 #  define ZSTDCLI_CLEVEL_DEFAULT 3
 #endif
 
-#ifndef ZSTD_NUMTHREADS_DEFAULT
-#  define ZSTD_NUMTHREADS_DEFAULT 1
-#endif
-
 #ifndef ZSTDCLI_CLEVEL_MAX
 #  define ZSTDCLI_CLEVEL_MAX 19   /* without using --ultra */
 #endif
 
-
+#ifndef ZSTDCLI_NUMTHREADS_DEFAULT
+#  define ZSTDCLI_NUMTHREADS_DEFAULT 1
+#endif
 
 /*-************************************
 *  Dependencies
@@ -628,7 +626,7 @@ static unsigned init_numThreads(void) {
             unsigned numThreads;
             if (readU32FromCharChecked(&ptr, &numThreads)) {
                 DISPLAYLEVEL(2, "Ignore environment variable setting %s=%s: numeric value too large \n", ENV_NUMTHREADS, env);
-                return ZSTD_NUMTHREADS_DEFAULT;
+                return ZSTDCLI_NUMTHREADS_DEFAULT;
             } else if (*ptr == 0) {
                 return numThreads;
             }
@@ -636,7 +634,7 @@ static unsigned init_numThreads(void) {
         DISPLAYLEVEL(2, "Ignore environment variable setting %s=%s: not a valid unsigned value \n", ENV_NUMTHREADS, env);
     }
 
-    return ZSTD_NUMTHREADS_DEFAULT;
+    return ZSTDCLI_NUMTHREADS_DEFAULT;
 }
 
 #define NEXT_FIELD(ptr) {         \
@@ -680,7 +678,6 @@ typedef enum { zom_compress, zom_decompress, zom_test, zom_bench, zom_train, zom
 # define MAXCLEVEL  ZSTD_maxCLevel()
 #endif
 
-
 int main(int const argCount, const char* argv[])
 {
     int argNb,