Browse Source

Make restGetFile extern C

bb-10.2-MDEV-14183-aria_pack
Olivier Bertrand 6 years ago
parent
commit
579d572d25
  1. 2
      storage/connect/restget.cpp
  2. 6
      storage/connect/tabrest.cpp
  3. 4
      storage/connect/tabrest.h

2
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. */
/***********************************************************************/

6
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

4
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

Loading…
Cancel
Save