Browse Source

Merge pull request #149 from troky/master

Bugfix and cleanup.
build-mingw
Noel Maersk 11 years ago
parent
commit
d2c6f9a799
  1. 2
      api.c
  2. 2
      sgminer.c
  3. 4
      winbuild/sgminer.vcxproj

2
api.c

@ -1005,7 +1005,7 @@ static struct api_data *print_data(struct api_data *root, char *buf, bool isjson
sprintf(buf, "%s", *((bool *)(root->data)) ? TRUESTR : FALSESTR); sprintf(buf, "%s", *((bool *)(root->data)) ? TRUESTR : FALSESTR);
break; break;
case API_TIMEVAL: case API_TIMEVAL:
snprintf(buf, sizeof(buf), "%"PRIu64".%06lu", sprintf(buf, "%"PRIu64".%06lu",
(uint64_t)((struct timeval *)(root->data))->tv_sec, (uint64_t)((struct timeval *)(root->data))->tv_sec,
(unsigned long)((struct timeval *)(root->data))->tv_usec); (unsigned long)((struct timeval *)(root->data))->tv_usec);
break; break;

2
sgminer.c

@ -5588,7 +5588,7 @@ static bool pool_active(struct pool *pool, bool pinging)
bool ret = false; bool ret = false;
json_t *val; json_t *val;
CURL *curl; CURL *curl;
int uninitialised_var(rolltime); int rolltime = 0;
if (pool->has_gbt) if (pool->has_gbt)
applog(LOG_DEBUG, "Retrieving block template from %s", pool->poolname); applog(LOG_DEBUG, "Retrieving block template from %s", pool->poolname);

4
winbuild/sgminer.vcxproj

@ -99,7 +99,7 @@
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
<GenerateDebugInformation>false</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>$(ProjectDir)dist\lib\x86</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>$(ProjectDir)dist\lib\x86</AdditionalLibraryDirectories>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<OptimizeReferences>false</OptimizeReferences> <OptimizeReferences>false</OptimizeReferences>
@ -136,7 +136,7 @@ exit 0</Command>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
<GenerateDebugInformation>false</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>$(ProjectDir)dist\lib\x64</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>$(ProjectDir)dist\lib\x64</AdditionalLibraryDirectories>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<OptimizeReferences>false</OptimizeReferences> <OptimizeReferences>false</OptimizeReferences>

Loading…
Cancel
Save