Browse Source

prepare next version

master
Tanguy Pruvot 10 years ago
parent
commit
2de9b1375b
  1. 2
      configure.ac
  2. 6
      cpu-miner.c
  3. 6
      cpuminer-config.h
  4. 2
      cuda_helper.h

2
configure.ac

@ -1,4 +1,4 @@
AC_INIT([ccminer], [1.4.5]) AC_INIT([ccminer], [1.4.6])
AC_PREREQ([2.59c]) AC_PREREQ([2.59c])
AC_CANONICAL_SYSTEM AC_CANONICAL_SYSTEM

6
cpu-miner.c

@ -1496,12 +1496,12 @@ static void *stratum_thread(void *userdata)
time(&g_work_time); time(&g_work_time);
if (stratum.job.clean) { if (stratum.job.clean) {
if (!opt_quiet) 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); stratum.bloc_height);
restart_threads(); restart_threads();
hashlog_purge_old(); hashlog_purge_old();
} else if (!opt_quiet) { } 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); strtoul(stratum.job.job_id, NULL, 16), stratum.bloc_height);
} }
pthread_mutex_unlock(&g_work_lock); pthread_mutex_unlock(&g_work_lock);
@ -1526,7 +1526,7 @@ out:
return NULL; return NULL;
} }
#define PROGRAM_VERSION "1.4.5" #define PROGRAM_VERSION "1.4.6"
static void show_version_and_exit(void) static void show_version_and_exit(void)
{ {
printf("%s v%s\n" printf("%s v%s\n"

6
cpuminer-config.h

@ -156,7 +156,7 @@
#define PACKAGE_NAME "ccminer" #define PACKAGE_NAME "ccminer"
/* Define to the full name and version of this package. */ /* 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 to the one symbol short name of this package. */
#define PACKAGE_TARNAME "ccminer" #define PACKAGE_TARNAME "ccminer"
@ -165,7 +165,7 @@
#define PACKAGE_URL "" #define PACKAGE_URL ""
/* Define to the version of this package. */ /* 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 /* If using the C implementation of alloca, define if you know the
direction of stack growth for your system; otherwise it will be direction of stack growth for your system; otherwise it will be
@ -188,7 +188,7 @@
#define USE_XOP 1 #define USE_XOP 1
/* Version number of package */ /* 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. */ /* Define curl_free() as free() if our version of curl lacks curl_free. */
/* #undef curl_free */ /* #undef curl_free */

2
cuda_helper.h

@ -318,7 +318,7 @@ uint64_t ROTL64(const uint64_t x, const int offset)
: "=l"(result) : "l"(x), "r"(offset)); : "=l"(result) : "l"(x), "r"(offset));
return result; return result;
} }
#elif __CUDA_ARCH__ >= 350 && USE_ROT_ASM_OPT == 3 #elif __CUDA_ARCH__ >= 320 && USE_ROT_ASM_OPT == 3
__device__ __device__
uint64_t ROTL64(const uint64_t x, const int offset) uint64_t ROTL64(const uint64_t x, const int offset)
{ {

Loading…
Cancel
Save