Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

fix swig exports for linux

  • Loading branch information...
commit cccf74381605590e18d3cae3d23181d6caf40120 1 parent c88ab7d
@da2ce7 da2ce7 authored
View
7 include/otapi/OTAPI_Basic.hpp
@@ -147,13 +147,6 @@ Every other type will be wrapped in a std::string.
#include <ExportWrapper.h>
#include <WinsockWrapper.h>
-#ifdef SWIG
-#ifdef EXPORT
-#undef EXPORT
-#endif
-#define EXPORT
-#endif
-
#include <string>
View
7 include/otapi/OTMadeEasy.hpp
@@ -148,13 +148,6 @@ Every other type will be wrapped in a std::string.
#include <ExportWrapper.h>
#include <WinsockWrapper.h>
-#ifdef SWIG
-#ifdef EXPORT
-#undef EXPORT
-#endif
-#define EXPORT
-#endif
-
#include <string>
class OT_ME;
View
17 include/otlib/ExportWrapper.h
@@ -2,25 +2,20 @@
#define _EXPORT_WRAPPER_H_
#endif // no guard.
-#ifndef SWIG // no export for swig.
-#ifdef _WIN32
-// DLL Export/Import for Win32
+#if defined(_WINDLL) && !defined(NOEXPORT) && !defined(SWIG)
+
#ifdef EXPORT
#undef EXPORT
#endif
-#ifndef NOEXPORT
-#ifdef _WINDLL
#ifdef IMPORT
- #define EXPORT __declspec(dllimport)
+#define EXPORT __declspec(dllimport)
#else
- #define EXPORT __declspec(dllexport)
+#define EXPORT __declspec(dllexport)
#endif
+
#else
- #define EXPORT
-#endif
+#define EXPORT
#endif
-#endif
-#endif
View
7 include/otlib/OTPassword.hpp
@@ -136,13 +136,6 @@
#include <ExportWrapper.h>
#include <WinsockWrapper.h>
-#ifdef SWIG
-#ifdef EXPORT
-#undef EXPORT
-#endif
-#define EXPORT
-#endif
-
#include <OTCachedKey.hpp>
#include <string>
View
7 include/otlib/OTStorage.hpp
@@ -130,13 +130,6 @@
#include <ExportWrapper.h>
#include <WinsockWrapper.h>
-#ifdef SWIG
-#ifdef EXPORT
-#undef EXPORT
-#endif
-#define EXPORT
-#endif
-
#if __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wunused-function"
View
1  swig/otapi/OTAPI.i
@@ -570,6 +570,7 @@ OT_IS_ELEMENT_TYPE(TradeListNym)
/* Parse the header file to generate wrappers */
+%include "../../include/otlib/ExportWrapper.h"
%include "../../include/otlib/OTPassword.hpp"
%include "../../include/otapi/OTAPI_Basic.hpp"
%include "../../include/otapi/OTMadeEasy.hpp"
Please sign in to comment.
Something went wrong with that request. Please try again.