Merge remote-tracking branch 'upstream/v5_0' into x11mod

algorithm/marucoin.c

@@ -66,7 +66,7 @@ typedef struct {
     sph_fugue512_context    fugue1;
 } Xhash_context_holder;
 
-Xhash_context_holder base_contexts;
+static Xhash_context_holder base_contexts;
 
 
 void init_Mhash_contexts()

algorithm/talkcoin.c

@@ -47,7 +47,7 @@ typedef struct
   sph_skein512_context    skein1;
 } Xhash_context_holder;
 
-Xhash_context_holder base_contexts;
+static Xhash_context_holder base_contexts;
 
 void init_Nhash_contexts()
 {

winbuild/sgminer.vcxproj

@@ -257,6 +257,7 @@
     <ClCompile Include="..\adl.c" />
     <ClCompile Include="..\algorithm.c" />
     <ClCompile Include="..\algorithm\animecoin.c" />
+    <ClCompile Include="..\algorithm\talkcoin.c" />
     <ClCompile Include="..\api.c" />
     <ClCompile Include="..\ccan\opt\helpers.c" />
     <ClCompile Include="..\ccan\opt\opt.c" />
@@ -319,6 +320,7 @@
     <ClInclude Include="..\adl.h" />
     <ClInclude Include="..\algorithm.h" />
     <ClInclude Include="..\algorithm\animecoin.h" />
+    <ClInclude Include="..\algorithm\talkcoin.h" />
     <ClInclude Include="..\api.h" />
     <ClInclude Include="..\arg-nonnull.h" />
     <ClInclude Include="..\bench_block.h" />

winbuild/sgminer.vcxproj.filters

@@ -215,6 +215,9 @@
     <ClCompile Include="..\config_parser.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\algorithm\talkcoin.c">
+      <Filter>Source Files\algorithm</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\adl.h">
@@ -388,6 +391,9 @@
     <ClInclude Include="..\config_parser.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\algorithm\talkcoin.h">
+      <Filter>Header Files\algorithm</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="README.txt" />