Make restGetFile extern C

MariaDB · Dec 3, 2019 · 579d572 · 579d572
1 parent 64b1b95
commit 579d572
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/storage/connect/restget.cpp b/storage/connect/restget.cpp
@@ -13,6 +13,8 @@ using namespace concurrency::streams; // Asynchronous streams
 
 typedef const char* PCSZ;
 
+extern "C" int restGetFile(char* m, bool xt, PCSZ http, PCSZ uri, PCSZ fn);
+
 /***********************************************************************/
 /*  Make a local copy of the requested file.                           */
 /***********************************************************************/

diff --git a/storage/connect/tabrest.cpp b/storage/connect/tabrest.cpp
@@ -15,9 +15,9 @@
 #define _MAX_PATH 260
 #if !defined(__WIN__)
 #define __stdcall
-//#if !defined(REST_SOURCE)
-//#include <dlfcn.h>         // dlopen(), dlclose(), dlsym() ...
-//#endif
+#if !defined(REST_SOURCE)
+#include <dlfcn.h>         // dlopen(), dlclose(), dlsym() ...
+#endif
 #endif   // !__WIN__
 #define _OS_H_INCLUDED     // Prevent os.h to be called
 #endif  // !MARIADB

diff --git a/storage/connect/tabrest.h b/storage/connect/tabrest.h
@@ -18,7 +18,9 @@ typedef int(__stdcall* XGETREST) (char*, bool, PCSZ, PCSZ, PCSZ);
 /*  Functions used by REST.                                            */
 /***********************************************************************/
 XGETREST GetRestFunction(PGLOBAL g);
-int restGetFile(char* m, bool x, PCSZ http, PCSZ uri, PCSZ fn);
+#if defined(REST_SOURCE)
+extern "C" int restGetFile(char* m, bool xt, PCSZ http, PCSZ uri, PCSZ fn);
+#endif   // REST_SOURCE
 #if defined(MARIADB)
 PQRYRES RESTColumns(PGLOBAL g, PTOS tp, char* tab, char* db, bool info);
 #endif  // !MARIADB