Make some globals static that can be

External linkage does not help and just encourages sloppy dependencies and can lead to weird issues when there are name collisions.
2018-01-14 17:23:05 +01:00
parent 38246ea461
commit 39d2e9e0cb
9 changed files with 36 additions and 34 deletions
--- a/src/zcash/JoinSplit.cpp
+++ b/src/zcash/JoinSplit.cpp
@@ -24,8 +24,7 @@ namespace libzcash {

 #include "zcash/circuit/gadget.tcc"

-CCriticalSection cs_ParamsIO;
-CCriticalSection cs_LoadKeys;
+static CCriticalSection cs_ParamsIO;

 template<typename T>
 void saveToFile(const std::string path, T& obj) {
--- a/src/zcash/Proof.cpp
+++ b/src/zcash/Proof.cpp
@@ -216,7 +216,7 @@ ZCProof ZCProof::random_invalid()
    return p;
 }

-std::once_flag init_public_params_once_flag;
+static std::once_flag init_public_params_once_flag;

 void initialize_curve_params()
 {