Cleanup and fixes (#180)

4 files changed, 28 insertions, 8 deletions

diff --git a/zano_libwallet2_api_c/src/main/cpp/zano_checksum.c b/zano_libwallet2_api_c/src/main/cpp/zano_checksum.c
new file mode 100644
index 0000000..c5fa83a
--- /dev/null
+++ b/zano_libwallet2_api_c/src/main/cpp/zano_checksum.c
@@ -0,0 +1,5 @@
+#include "zano_checksum.h"
+
+const char * ZANO_wallet2_api_c_h_sha256 = "8acaa95513b85a984c08e05cc3f2ac7530bb8f32946eeeb45357bd846aef33dd";
+const char * ZANO_wallet2_api_c_cpp_sha256 = "cdec2578df387ab3587712f77470500934d7f18c27201ae71bc3ee52cb784cbd-b372a99c7ada82caac53b677d9aaa7c0902e3b0b";
+const char * ZANO_wallet2_api_c_exp_sha256 = "66f3ff655bbfd11ad28c318ab707090b5a93276f436b06f7b1c0f329dba3c9c2";
diff --git a/zano_libwallet2_api_c/src/main/cpp/zano_checksum.h b/zano_libwallet2_api_c/src/main/cpp/zano_checksum.h
index 90e9f30..7d9b572 100644
--- a/zano_libwallet2_api_c/src/main/cpp/zano_checksum.h
+++ b/zano_libwallet2_api_c/src/main/cpp/zano_checksum.h
@@ -1,6 +1,21 @@
-#ifndef MONEROC_CHECKSUMS
-#define MONEROC_CHECKSUMS
-const char * ZANO_wallet2_api_c_h_sha256 = "8acaa95513b85a984c08e05cc3f2ac7530bb8f32946eeeb45357bd846aef33dd";
-const char * ZANO_wallet2_api_c_cpp_sha256 = "4efacd3812d53dd268b6869cc0a9560e7320574d96e09136cf067f796edfeba6-b372a99c7ada82caac53b677d9aaa7c0902e3b0b";
-const char * ZANO_wallet2_api_c_exp_sha256 = "66f3ff655bbfd11ad28c318ab707090b5a93276f436b06f7b1c0f329dba3c9c2";
+#ifndef MONEROC_CHECKSUMS_ZANO
+#define MONEROC_CHECKSUMS_ZANO
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+#ifdef __MINGW32__
+    #define ADDAPI __declspec(dllexport)
+#else
+    #define ADDAPI __attribute__((__visibility__("default")))
+#endif
+
+extern ADDAPI const char * ZANO_wallet2_api_c_h_sha256;
+extern ADDAPI const char * ZANO_wallet2_api_c_cpp_sha256;
+extern ADDAPI const char * ZANO_wallet2_api_c_exp_sha256;
+
+#ifdef __cplusplus
+}
+#endif
 #endif
diff --git a/zano_libwallet2_api_c/src/main/cpp/wallet2_api_c.cpp b/zano_libwallet2_api_c/src/main/cpp/zano_wallet2_api_c.cpp
index 11acc0a..364fdb8 100644
--- a/zano_libwallet2_api_c/src/main/cpp/wallet2_api_c.cpp
+++ b/zano_libwallet2_api_c/src/main/cpp/zano_wallet2_api_c.cpp
@@ -1,11 +1,11 @@
 #include <inttypes.h>
-#include "wallet2_api_c.h"
+#include "zano_wallet2_api_c.h"
 #include <unistd.h>
 #include <cstring>
 #include <thread>
-#include "zano_checksum.h"
 #include "helpers.hpp"
 #include "../../../../zano/src/wallet/plain_wallet_api.h"
+#include "zano_checksum.h"
 
 #ifdef __cplusplus
 extern "C"
@@ -196,7 +196,7 @@ const char* ZANO_PlainWallet_generate(const char* path, const char* password) {
     return buffer;
     DEBUG_END()
 }
-//   std::string get_opened_wallets();  
+//   std::string get_opened_wallets();
 const char* ZANO_PlainWallet_getOpenWallets() {
     DEBUG_START()
     std::string str = plain_wallet::get_opened_wallets();
diff --git a/zano_libwallet2_api_c/src/main/cpp/wallet2_api_c.h b/zano_libwallet2_api_c/src/main/cpp/zano_wallet2_api_c.h
index df6d3ef..df6d3ef 100644
--- a/zano_libwallet2_api_c/src/main/cpp/wallet2_api_c.h
+++ b/zano_libwallet2_api_c/src/main/cpp/zano_wallet2_api_c.h