summaryrefslogtreecommitdiff
path: root/storage/connect
diff options
context:
space:
mode:
authorOlivier Bertrand <bertrandop@gmail.com>2019-12-01 00:14:24 +0100
committerOlivier Bertrand <bertrandop@gmail.com>2019-12-01 00:14:24 +0100
commit65310f5855924251a5a06247bbea82cce768f834 (patch)
treed7b1fb12c3ec6de3d460e750cba26de5f944411d /storage/connect
parent1f7f533144d5b78427622c8f3dd51bfc276dd12e (diff)
downloadmariadb-git-65310f5855924251a5a06247bbea82cce768f834.tar.gz
<dlfnc.h> in tabrest.cpp and redef.cpp
Diffstat (limited to 'storage/connect')
-rw-r--r--storage/connect/reldef.cpp2
-rw-r--r--storage/connect/tabrest.cpp6
2 files changed, 4 insertions, 4 deletions
diff --git a/storage/connect/reldef.cpp b/storage/connect/reldef.cpp
index ffe5f77661d..ebbd4d76029 100644
--- a/storage/connect/reldef.cpp
+++ b/storage/connect/reldef.cpp
@@ -20,7 +20,7 @@
#if defined(__WIN__)
#include <sqlext.h>
#else
-#include <dlfcn.h> // dlopen(), dlclose(), dlsym() ...
+//#include <dlfcn.h> // dlopen(), dlclose(), dlsym() ...
#include "osutil.h"
//#include "sqlext.h"
#endif
diff --git a/storage/connect/tabrest.cpp b/storage/connect/tabrest.cpp
index db8611eec02..7e0d736f4e7 100644
--- a/storage/connect/tabrest.cpp
+++ b/storage/connect/tabrest.cpp
@@ -10,14 +10,14 @@
/***********************************************************************/
#if defined(MARIADB)
#include <my_global.h> // All MariaDB stuff
-#if !defined(__WIN__) && !defined(REST_SOURCE)
-#include <dlfcn.h> // dlopen(), dlclose(), dlsym() ...
-#endif
#else // !MARIADB OEM module
#include "mini-global.h"
#define _MAX_PATH 260
#if !defined(__WIN__)
#define __stdcall
+#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