Changeset: d9cf7dcbe006 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d9cf7dcbe006
Modified Files:
monetdb5/extras/rapi/Makefile.ag
monetdb5/mal/mal_linker.c
monetdb5/mal/mal_linker.h
Branch: RIntegration-default
Log Message:
Some more compilation fixes in monetdb5
diffs (32 lines):
diff --git a/monetdb5/extras/rapi/Makefile.ag b/monetdb5/extras/rapi/Makefile.ag
--- a/monetdb5/extras/rapi/Makefile.ag
+++ b/monetdb5/extras/rapi/Makefile.ag
@@ -20,6 +20,7 @@ INCLUDES = \
../../../common/stream \
../../../gdk \
../../mal \
+ ../../../sql/include \
$(libr_CFLAGS)
MTSAFE
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
@@ -325,7 +325,7 @@ cmpstr(const void *_p1, const void *_p2)
#define MAXMULTISCRIPT 48
-static char *
+char *
locate_file(const char *basename, const char *ext, bit recurse)
{
char *mod_path = GDKgetenv("monet_mod_path");
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
@@ -42,4 +42,5 @@ mal_export void unloadLibraries(void);
mal_export void initLibraries(void);
mal_export int isPreloaded(str nme);
mal_export int isLoaded(str modulename);
+mal_export char *locate_file(const char *basename, const char *ext, bit
recurse);
#endif /* _MAL_LINKER_H */
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
