Permalink
Browse files

Added fixes for jasson and longpoll fix (all by ArtForz)

  • Loading branch information...
1 parent de74557 commit b86916b8f1cfb7b53fca40e614b3f5f4fe839808 @Lolcust committed Oct 1, 2011
Showing with 6 additions and 0 deletions.
  1. +4 −0 cpu-miner.c
  2. +2 −0 scrypt.c
View
@@ -783,7 +783,11 @@ static void parse_arg (int key, char *arg)
json_error_t err;
if (opt_config)
json_decref(opt_config);
+#if JANSSON_VERSION_HEX >= 0x020000
+ opt_config = json_load_file(arg, 0, &err);
+#else
opt_config = json_load_file(arg, &err);
+#endif
if (!json_is_object(opt_config)) {
applog(LOG_ERR, "JSON decode of %s failed", arg);
show_usage();
View
@@ -686,6 +686,8 @@ int scanhash_scrypt(int thr_id, unsigned char *pdata, unsigned char *scratchbuf,
uint32_t n = 0;
uint32_t Htarg = *(uint32_t *)(ptarget + 28);
int i;
+
+ work_restart[thr_id].restart = 0;
for (i = 0; i < 80/4; i++)
((uint32_t *)data)[i] = swab32(((uint32_t *)pdata)[i]);

0 comments on commit b86916b

Please sign in to comment.