Changeset: b35ced4ba32f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/b35ced4ba32f
Modified Files:
sql/backends/monet5/sql_statement.h
sql/server/rel_basetable.h
sql/server/rel_prop.h
sql/server/rel_rel.h
sql/server/rel_remote.h
Branch: odbc_loader
Log Message:
windows needs these functions exported
diffs (69 lines):
diff --git a/sql/backends/monet5/sql_statement.h
b/sql/backends/monet5/sql_statement.h
--- a/sql/backends/monet5/sql_statement.h
+++ b/sql/backends/monet5/sql_statement.h
@@ -253,7 +253,7 @@ extern stmt *stmt_convert(backend *sa, s
extern stmt *stmt_unop(backend *be, stmt *op1, stmt *sel, sql_subfunc *op);
extern stmt *stmt_binop(backend *be, stmt *op1, stmt *op2, stmt *sel,
sql_subfunc *op);
extern stmt *stmt_Nop(backend *be, stmt *ops, stmt *sel, sql_subfunc *op,
stmt* rows);
-extern stmt *stmt_func(backend *be, stmt *ops, const char *name, sql_rel *imp,
int f_union);
+sql_export stmt *stmt_func(backend *be, stmt *ops, const char *name, sql_rel
*imp, int f_union);
extern stmt *stmt_direct_func(backend *be, InstrPtr q);
extern stmt *stmt_aggr(backend *be, stmt *op1, stmt *grp, stmt *ext,
sql_subfunc *op, int reduce, int no_nil, int nil_if_empty);
diff --git a/sql/server/rel_basetable.h b/sql/server/rel_basetable.h
--- a/sql/server/rel_basetable.h
+++ b/sql/server/rel_basetable.h
@@ -24,7 +24,7 @@
extern sql_table *rel_ddl_table_get(sql_rel *r);
extern sql_rel *rel_ddl_basetable_get(sql_rel *r);
-extern sql_rel *rel_basetable(mvc *sql, sql_table *t, const char *tname);
+sql_export sql_rel *rel_basetable(mvc *sql, sql_table *t, const char *tname);
extern void rel_base_copy(mvc *sql, sql_rel *in, sql_rel *out);
extern void rel_base_disallow(sql_rel *r); /* set flag to check
per column access */
@@ -33,7 +33,7 @@ extern int rel_base_idx_nid(sql_rel *t,
extern bool rel_base_has_nid(sql_rel *t, int nid);
extern int rel_base_use(mvc *ql, sql_rel *rt, int nr); /* return error on
(read) access violation */
extern void rel_base_use_tid(mvc *sql, sql_rel *rt);
-extern void rel_base_use_all(mvc *sql, sql_rel *rel);
+sql_export void rel_base_use_all(mvc *sql, sql_rel *rel);
extern char *rel_base_name(sql_rel *r);
extern char *rel_base_rename(sql_rel *r, char *name);
diff --git a/sql/server/rel_prop.h b/sql/server/rel_prop.h
--- a/sql/server/rel_prop.h
+++ b/sql/server/rel_prop.h
@@ -43,7 +43,7 @@ typedef struct tid_uri {
const char* uri;
} tid_uri;
-extern prop * prop_create( allocator *sa, rel_prop kind, prop *pre );
+sql_export prop * prop_create( allocator *sa, rel_prop kind, prop *pre );
extern prop * prop_copy( allocator *sa, prop *p);
extern prop * prop_remove( prop *plist, prop *p);
extern prop * find_prop( prop *p, rel_prop kind);
diff --git a/sql/server/rel_rel.h b/sql/server/rel_rel.h
--- a/sql/server/rel_rel.h
+++ b/sql/server/rel_rel.h
@@ -120,7 +120,7 @@ extern sql_rel *rel_relational_func(allo
extern sql_rel *rel_table_func(allocator *sa, sql_rel *l, sql_exp *f, list
*exps, int kind);
extern list *_rel_projections(mvc *sql, sql_rel *rel, const char *tname, int
settname , int intern, int basecol);
-extern list *rel_projections(mvc *sql, sql_rel *rel, const char *tname, int
settname , int intern);
+sql_export list *rel_projections(mvc *sql, sql_rel *rel, const char *tname,
int settname , int intern);
extern sql_rel *rel_push_select(mvc *sql, sql_rel *rel, sql_exp *ls, sql_exp
*e, int f);
extern sql_rel *rel_push_join(mvc *sql, sql_rel *rel, sql_exp *ls, sql_exp
*rs, sql_exp *rs2, sql_exp *e, int f);
diff --git a/sql/server/rel_remote.h b/sql/server/rel_remote.h
--- a/sql/server/rel_remote.h
+++ b/sql/server/rel_remote.h
@@ -15,7 +15,7 @@
#include "sql_relation.h"
-extern int mapiuri_valid( const char *uri);
+sql_export int mapiuri_valid( const char *uri);
extern const char *mapiuri_uri(const char *uri, allocator *sa);
extern const char *mapiuri_database(const char *uri, allocator *sa);
extern const char *mapiuri_schema(const char *uri, allocator *sa, const char
*fallback);
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
