From 2de9b1375bd4b6b315cd5cc98c9b8c1b2ffc8a45 Mon Sep 17 00:00:00 2001 From: Tanguy Pruvot Date: Mon, 20 Oct 2014 18:58:53 +0200 Subject: [PATCH] prepare next version --- configure.ac | 2 +- cpu-miner.c | 6 +++--- cpuminer-config.h | 6 +++--- cuda_helper.h | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index e115d79..a16a6e3 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([ccminer], [1.4.5]) +AC_INIT([ccminer], [1.4.6]) AC_PREREQ([2.59c]) AC_CANONICAL_SYSTEM diff --git a/cpu-miner.c b/cpu-miner.c index 5fc0891..1082ec6 100644 --- a/cpu-miner.c +++ b/cpu-miner.c @@ -1496,12 +1496,12 @@ static void *stratum_thread(void *userdata) time(&g_work_time); if (stratum.job.clean) { if (!opt_quiet) - applog(LOG_BLUE, "%s send a new %s block %d", short_url, algo_names[opt_algo], + applog(LOG_BLUE, "%s sent %s block %d", short_url, algo_names[opt_algo], stratum.bloc_height); restart_threads(); hashlog_purge_old(); } else if (!opt_quiet) { - applog(LOG_BLUE, "%s send job %d for block %d", short_url, + applog(LOG_BLUE, "%s asks job %d for block %d", short_url, strtoul(stratum.job.job_id, NULL, 16), stratum.bloc_height); } pthread_mutex_unlock(&g_work_lock); @@ -1526,7 +1526,7 @@ out: return NULL; } -#define PROGRAM_VERSION "1.4.5" +#define PROGRAM_VERSION "1.4.6" static void show_version_and_exit(void) { printf("%s v%s\n" diff --git a/cpuminer-config.h b/cpuminer-config.h index f1d7a31..53b1743 100644 --- a/cpuminer-config.h +++ b/cpuminer-config.h @@ -156,7 +156,7 @@ #define PACKAGE_NAME "ccminer" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "ccminer 1.4.5" +#define PACKAGE_STRING "ccminer 1.4.6" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "ccminer" @@ -165,7 +165,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.4.5" +#define PACKAGE_VERSION "1.4.6" /* If using the C implementation of alloca, define if you know the direction of stack growth for your system; otherwise it will be @@ -188,7 +188,7 @@ #define USE_XOP 1 /* Version number of package */ -#define VERSION "1.4.5" +#define VERSION "1.4.6" /* Define curl_free() as free() if our version of curl lacks curl_free. */ /* #undef curl_free */ diff --git a/cuda_helper.h b/cuda_helper.h index db1dde3..920a12d 100644 --- a/cuda_helper.h +++ b/cuda_helper.h @@ -318,7 +318,7 @@ uint64_t ROTL64(const uint64_t x, const int offset) : "=l"(result) : "l"(x), "r"(offset)); return result; } -#elif __CUDA_ARCH__ >= 350 && USE_ROT_ASM_OPT == 3 +#elif __CUDA_ARCH__ >= 320 && USE_ROT_ASM_OPT == 3 __device__ uint64_t ROTL64(const uint64_t x, const int offset) {