fix included jansson version number (v2.6)

awehoky169 · Aug 3, 2015 · 5a501c0 · 5a501c0
1 parent 50a4869
commit 5a501c0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/compat/jansson/jansson.h b/compat/jansson/jansson.h
@@ -21,11 +21,11 @@ extern "C" {
 /* version */
 
 #define JANSSON_MAJOR_VERSION  2
-#define JANSSON_MINOR_VERSION  5
+#define JANSSON_MINOR_VERSION  6
 #define JANSSON_MICRO_VERSION  0
 
 /* Micro version is omitted if it's 0 */
-#define JANSSON_VERSION  "2.5"
+#define JANSSON_VERSION  "2.6"
 
 /* Version as a 3-byte hex number, e.g. 0x010201 == 1.2.1. Use this
    for numeric comparisons, e.g. #if JANSSON_VERSION_HEX >= ... */

diff --git a/cpu-miner.c b/cpu-miner.c
@@ -2412,9 +2412,7 @@ static void show_version_and_exit(void)
 	/* dependencies versions */
 	printf("%s\n", curl_version());
 #ifdef JANSSON_VERSION
-	printf("libjansson/%s ", JANSSON_VERSION);
-#else
-	printf("libjansson/1.3 "); /* windows */
+	printf("jansson/%s ", JANSSON_VERSION);
 #endif
 #ifdef PTW32_VERSION
 	printf("pthreads/%d.%d.%d.%d ", PTW32_VERSION);