Changeset: 42fef49ec848 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=42fef49ec848
Modified Files:
common/stream/stream.c
embedded/CMakeLists.txt
gdk/gdk_posix.h
monetdb5/mal/mal_linker.c
monetdb5/mal/mal_linker.h
Branch: cmake-monetdblite
Log Message:
Windows compilation fixes.
diffs (103 lines):
diff --git a/common/stream/stream.c b/common/stream/stream.c
--- a/common/stream/stream.c
+++ b/common/stream/stream.c
@@ -156,7 +156,7 @@ mnstr_init(void)
if (ATOMIC_TAS(&inited))
return 0;
-#ifdef NATIVE_WIN32
+#if defined(NATIVE_WIN32) && !defined(HAVE_EMBEDDED)
{
WSADATA w;
@@ -2663,6 +2663,8 @@ socket_wstream(SOCKET sock, const char *
return s;
}
+#endif /* HAVE EMBEDDED*/
+
/* ------------------------------------------------------------------ */
/* streams working on an open file pointer */
@@ -2971,7 +2973,6 @@ console_destroy(stream *s)
destroy(s);
}
#endif
-#endif /* HAVE EMBEDDED*/
static stream *
file_stream(const char *name)
diff --git a/embedded/CMakeLists.txt b/embedded/CMakeLists.txt
--- a/embedded/CMakeLists.txt
+++ b/embedded/CMakeLists.txt
@@ -11,6 +11,13 @@ include_directories(${CMAKE_CURRENT_BINA
../monetdb5/optimizer
../sql/backends/monet5 ../sql/include ../sql/common ../sql/scripts
../sql/server ../sql/storage
../sql/storage/bat)
+add_definitions(${COMPILER_OPTION}DLIBMUTILS ${COMPILER_OPTION}DLIBMEROUTIL
${COMPILER_OPTION}DLIBSTREAM
+ ${COMPILER_OPTION}DLIBGDK
${COMPILER_OPTION}DLIBMAL ${COMPILER_OPTION}DLIBATOMS
+ ${COMPILER_OPTION}DLIBKERNEL
${COMPILER_OPTION}DLIBSCHEDULER ${COMPILER_OPTION}DLIBMONETDB5
+ ${COMPILER_OPTION}DLIBOPTIMIZER
${COMPILER_OPTION}DLIBSQL ${COMPILER_OPTION}DLIBSQLSERVER
+ ${COMPILER_OPTION}DLIBSQLCOMMON
${COMPILER_OPTION}DLIBBATSTORE ${COMPILER_OPTION}DLIBSTORE
+ ${COMPILER_OPTION}DLIBMOPTIONS
${COMPILER_OPTION}DLIBEMBEDDED ${COMPILER_OPTION}DHAVE_EMBEDDED)
+
bison_target(sqlparserlite ../sql/server/sql_parser.y
${CMAKE_CURRENT_BINARY_DIR}/sql_sqlparserlite.tab.c
COMPILE_FLAGS "-d -p sql -r all" DEFINES_FILE
${CMAKE_CURRENT_BINARY_DIR}/sql_sqlparserlite.tab.h)
add_library(bisonlite_obj OBJECT ${BISON_sqlparserlite_OUTPUTS})
@@ -170,6 +177,7 @@ add_library(monetdblite SHARED
../monetdb5/modules/kernel/mmath.c
../monetdb5/modules/atoms/mtime.c
../monetdb5/modules/atoms/mtime_analytic.c
+ ../monetdb5/modules/atoms/strptime.c
../monetdb5/modules/mal/orderidx.c
../monetdb5/modules/mal/pcre.c
../monetdb5/modules/mal/projectionpath.c
@@ -278,9 +286,6 @@ target_link_libraries(monetdblite PRIVAT
${PSAPI_LIBRARIES})
set_target_properties(monetdblite PROPERTIES VERSION ${MONETDB_VERSION}
SOVERSION ${MONETDB_VERSION_MAJOR}
OUTPUT_NAME monetdb5)
-target_compile_definitions(monetdblite PRIVATE LIBMUTILS LIBMEROUTIL LIBSTREAM
LIBGDK LIBMAL LIBATOMS LIBKERNEL
- LIBSCHEDULER LIBMONETDB5
LIBOPTIMIZER LIBSQL LIBSQLSERVER LIBSQLCOMMON LIBBATSTORE LIBSTORE
- LIBMOPTIONS LIBEMBEDDED
HAVE_EMBEDDED)
install(TARGETS monetdblite DESTINATION ${LIBDIR}/monetdblite)
install(FILES monetdb_embedded.h DESTINATION ${INCLUDEDIR}/monetdb)
diff --git a/gdk/gdk_posix.h b/gdk/gdk_posix.h
--- a/gdk/gdk_posix.h
+++ b/gdk/gdk_posix.h
@@ -136,6 +136,7 @@ gdk_export void *mdlopen(const char *lib
#ifdef NATIVE_WIN32
+#define RTLD_LOCAL 0
#define RTLD_LAZY 1
#define RTLD_NOW 2
#define RTLD_GLOBAL 4
diff --git a/monetdb5/mal/mal_linker.c b/monetdb5/mal/mal_linker.c
--- a/monetdb5/mal/mal_linker.c
+++ b/monetdb5/mal/mal_linker.c
@@ -116,10 +116,10 @@ getAddress(str fcnname)
* the first argument must be the same as the base name of the
* library that is created in src/tools */
dl = mdlopen(monetdb5library, RTLD_NOW
-#ifndef HAVE_EMBEDDED
+#ifdef HAVE_EMBEDDED
+ | RTLD_LOCAL);
+#else
| RTLD_GLOBAL);
-#else
- | RTLD_LOCAL);
#endif
if (dl == NULL)
return NULL;
diff --git a/monetdb5/mal/mal_linker.h b/monetdb5/mal/mal_linker.h
--- a/monetdb5/mal/mal_linker.h
+++ b/monetdb5/mal/mal_linker.h
@@ -15,6 +15,7 @@
#ifndef NATIVE_WIN32
#include <dlfcn.h>
#else
+#define RTLD_LOCAL 0
#define RTLD_LAZY 1
#define RTLD_NOW 2
#define RTLD_GLOBAL 4
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
