Changeset: cfaf48a5bf8d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cfaf48a5bf8d
Modified Files:
tools/embedded/embedded.c
tools/embedded/embedded.h
Branch: embedded
Log Message:
Less R headers, so we don't require R to be built as a library
diffs (26 lines):
diff --git a/tools/embedded/embedded.c b/tools/embedded/embedded.c
--- a/tools/embedded/embedded.c
+++ b/tools/embedded/embedded.c
@@ -78,7 +78,7 @@ int monetdb_startup(char* dir) {
// This dynamically looks up functions, because the library containing
them is loaded at runtime.
SQLstatementIntern_ptr = (SQLstatementIntern_ptr_tpe)
lookup_function("lib_sql", "SQLstatementIntern");
- res_table_destroy_ptr = (res_table_destroy_ptr_tpe)
lookup_function("libstore", "res_table_destroy");
+ res_table_destroy_ptr = (res_table_destroy_ptr_tpe)
lookup_function("libstore", "res_table_destroy");
if (SQLstatementIntern_ptr == NULL || res_table_destroy_ptr == NULL)
goto cleanup;
monetdb_embedded_initialized = true;
diff --git a/tools/embedded/embedded.h b/tools/embedded/embedded.h
--- a/tools/embedded/embedded.h
+++ b/tools/embedded/embedded.h
@@ -13,10 +13,7 @@
#ifndef _INVERSE_RAPI_LIB_
#define _INVERSE_RAPI_LIB_
-#include <Rembedded.h>
#include <Rdefines.h>
-#include <Rinternals.h>
-#include <R_ext/Parse.h>
int monetdb_startup(char* dir);
void* monetdb_query(char* query);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
