Changeset: b4dfb2e22a16 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b4dfb2e22a16
Modified Files:
monetdb5/mal/mal.c
monetdb5/mal/mal_import.c
monetdb5/modules/mal/pcre.c
sql/backends/monet5/sql_scenario.c
tools/embedded/rpackage/configure
Branch: embedded
Log Message:
MonetDBLite now compiles in strict mode
diffs (90 lines):
diff --git a/monetdb5/mal/mal.c b/monetdb5/mal/mal.c
--- a/monetdb5/mal/mal.c
+++ b/monetdb5/mal/mal.c
@@ -135,9 +135,11 @@ void mserver_reset(void)
fprintf(stderr, "!%s", err);
free(err);
}
+ /* TODO: make sure this is still required
#ifdef HAVE_EMBEDDED
MTIMEreset();
#endif
+*/
mal_factory_reset();
mal_dataflow_reset();
GDKreset(0); // terminate all other threads
diff --git a/monetdb5/mal/mal_import.c b/monetdb5/mal/mal_import.c
--- a/monetdb5/mal/mal_import.c
+++ b/monetdb5/mal/mal_import.c
@@ -69,6 +69,7 @@ malOpenSource(str file)
return fd;
}
+#ifndef HAVE_EMBEDDED
/*
* The malLoadScript routine merely reads the contents of a file into
* the input buffer of the client. It is typically used in situations
@@ -97,6 +98,7 @@ malLoadScript(Client c, str name, bstrea
mnstr_printf(c->fdout, "!WARNING: could not read %s\n", name);
return MAL_SUCCEED;
}
+#endif
/*
* Beware that we have to isolate the execution of the source file
@@ -188,6 +190,8 @@ malInclude(Client c, str name, int listi
c->fdin = NULL;
#ifdef HAVE_EMBEDDED
+ (void) filename;
+ (void) p;
{
size_t mal_init_len = strlen(mal_init_inline);
buffer* mal_init_buf = buffer_create(mal_init_len);
diff --git a/monetdb5/modules/mal/pcre.c b/monetdb5/modules/mal/pcre.c
--- a/monetdb5/modules/mal/pcre.c
+++ b/monetdb5/modules/mal/pcre.c
@@ -736,10 +736,8 @@ str
pcre_init(void *ret)
{
(void) ret;
-#if !defined(HAVE_EMBEDDED) && !defined(NATIVE_WIN32)
pcre_malloc = my_pcre_malloc;
pcre_free = my_pcre_free;
-#endif
return NULL;
}
diff --git a/sql/backends/monet5/sql_scenario.c
b/sql/backends/monet5/sql_scenario.c
--- a/sql/backends/monet5/sql_scenario.c
+++ b/sql/backends/monet5/sql_scenario.c
@@ -473,6 +473,8 @@ SQLinitClient(Client c)
throw(PERMD, "SQLinitClient", "08004!schema authorization
error");
}
_DELETE(schema);
+#else
+ (void) schema;
#endif
/*expect SQL text first */
@@ -496,6 +498,8 @@ SQLinitClient(Client c)
}
if (SQLnewcatalog > 0) {
#ifdef HAVE_EMBEDDED
+ (void) bfd;
+ (void) fd;
SQLnewcatalog = 0;
maybeupgrade = 0;
{
diff --git a/tools/embedded/rpackage/configure
b/tools/embedded/rpackage/configure
--- a/tools/embedded/rpackage/configure
+++ b/tools/embedded/rpackage/configure
@@ -6,7 +6,7 @@ CFLAGS="-I$R_INCLUDE_DIR" ./configure --
--disable-jdbc --disable-merocontrol --disable-odbc --disable-console
--disable-microhttpd \
--without-perl --without-python2 --without-python3 --without-rubygem
--without-unixodbc \
--without-samtools --without-sphinxclient --without-geos --without-samtools
--without-readline \
---enable-optimize --enable-silent-rules --disable-assert --disable-strict
--disable-int128
+--enable-optimize --enable-silent-rules --disable-assert --enable-strict
--disable-int128
# Dirty hack, normally R would call make, but we need to also glue everything
together.
# So we do it ourselves instead and then render the MonetDB makefile inert.
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
