Changeset: 8f4f900fe7ce for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8f4f900fe7ce
Modified Files:
tools/embedded/rpackage/R/monetdb.R
tools/embedded/windows/monetdb_config.h.in
Branch: embedded
Log Message:
mc`
diffs (21 lines):
diff --git a/tools/embedded/rpackage/R/monetdb.R
b/tools/embedded/rpackage/R/monetdb.R
--- a/tools/embedded/rpackage/R/monetdb.R
+++ b/tools/embedded/rpackage/R/monetdb.R
@@ -1,4 +1,6 @@
.onLoad <- function(libname, pkgname){
+ # TODO: DLL on Windows
+ # TODO: save pkg path here to use in startup for monetdb_startup_R
dyn.load(file.path(libname, pkgname, "libs", "MonetDB.so"), local=F,
now=F)
}
diff --git a/tools/embedded/windows/monetdb_config.h.in
b/tools/embedded/windows/monetdb_config.h.in
--- a/tools/embedded/windows/monetdb_config.h.in
+++ b/tools/embedded/windows/monetdb_config.h.in
@@ -329,6 +329,7 @@
/* #define HAVE_LONG_LONG 1 */
#endif
#endif
+#define HAVE_LONG_LONG 1
/* Define to 1 if you have the <mach/mach_init.h> header file. */
/* #undef HAVE_MACH_MACH_INIT_H */
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
