Changeset: bc9a17909f49 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bc9a17909f49
Modified Files:
sql/server/rel_exp.h
sql/server/rel_rel.h
sql/server/rel_updates.h
sql/server/sql_semantic.h
Branch: scoping2
Log Message:
Compilation fix for Windows. Export find_table_or_view_on_scope symbol. Also
don't export symbols not used by any other library/executable
diffs (79 lines):
diff --git a/sql/server/rel_exp.h b/sql/server/rel_exp.h
--- a/sql/server/rel_exp.h
+++ b/sql/server/rel_exp.h
@@ -44,7 +44,7 @@ extern sql_exp *exp_compare_func(mvc *sq
#define exp_totype(e) ((list*)e->r)->h->next->data
extern sql_exp *exp_convert(sql_allocator *sa, sql_exp *exp, sql_subtype
*fromtype, sql_subtype *totype );
sql_export str number2name(str s, int len, int i);
-sql_export sql_exp *exp_op(sql_allocator *sa, list *l, sql_subfunc *f );
+extern sql_exp *exp_op(sql_allocator *sa, list *l, sql_subfunc *f );
extern sql_exp *exp_rank_op(sql_allocator *sa, list *largs, list *gbe, list
*obe, sql_subfunc *f );
#define append(l,v) list_append(l,v)
@@ -65,7 +65,7 @@ extern sql_exp * exp_atom_bool(sql_alloc
extern sql_exp * exp_atom_bte(sql_allocator *sa, bte i);
extern sql_exp * exp_atom_sht(sql_allocator *sa, sht i);
extern sql_exp * exp_atom_int(sql_allocator *sa, int i);
-sql_export sql_exp * exp_atom_lng(sql_allocator *sa, lng l);
+extern sql_exp * exp_atom_lng(sql_allocator *sa, lng l);
extern sql_exp *exp_atom_oid(sql_allocator *sa, oid i);
#ifdef HAVE_HGE
extern sql_exp * exp_atom_hge(sql_allocator *sa, hge l);
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
@@ -91,14 +91,14 @@ extern void rel_join_add_exp(sql_allocat
extern sql_exp *rel_groupby_add_aggr(mvc *sql, sql_rel *rel, sql_exp *e);
extern sql_rel *rel_select(sql_allocator *sa, sql_rel *l, sql_exp *e);
-sql_export sql_rel *rel_basetable(mvc *sql, sql_table *t, const char *tname);
+extern sql_rel *rel_basetable(mvc *sql, sql_table *t, const char *tname);
extern sql_rel *rel_groupby(mvc *sql, sql_rel *l, list *groupbyexps );
sql_export sql_rel *rel_project(sql_allocator *sa, sql_rel *l, list *e);
extern sql_rel *rel_project_exp(sql_allocator *sa, sql_exp *e);
extern sql_rel *rel_exception(sql_allocator *sa, sql_rel *l, sql_rel *r, list
*exps);
extern sql_rel *rel_relational_func(sql_allocator *sa, sql_rel *l, list *exps);
-sql_export sql_rel *rel_table_func(sql_allocator *sa, sql_rel *l, sql_exp *f,
list *exps, int kind);
+extern sql_rel *rel_table_func(sql_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);
diff --git a/sql/server/rel_updates.h b/sql/server/rel_updates.h
--- a/sql/server/rel_updates.h
+++ b/sql/server/rel_updates.h
@@ -18,7 +18,7 @@
extern sql_table *get_table(sql_rel *t); /* needed for rel_read at rel_dump */
extern sql_rel *rel_update(mvc *sql, sql_rel *t, sql_rel *uprel, sql_exp
**updates, list *exps);
-sql_export sql_rel *rel_insert(mvc *sql, sql_rel *t, sql_rel *inserts);
+extern sql_rel *rel_insert(mvc *sql, sql_rel *t, sql_rel *inserts);
extern sql_rel *rel_delete(sql_allocator *sa, sql_rel *t, sql_rel *deletes);
extern sql_rel *rel_truncate(sql_allocator *sa, sql_rel *t, int drop_action,
int check_identity);
diff --git a/sql/server/sql_semantic.h b/sql/server/sql_semantic.h
--- a/sql/server/sql_semantic.h
+++ b/sql/server/sql_semantic.h
@@ -19,11 +19,11 @@ typedef struct exp_kind_t {
bit reduce;
} exp_kind;
-sql_export sql_schema *cur_schema(mvc *sql);
+extern sql_schema *cur_schema(mvc *sql);
extern sql_schema *tmp_schema(mvc *sql);
/* Search function for SQL objects with scoping rules. For tables an optional
schema can be provided with search priority */
-extern sql_table *find_table_or_view_on_scope(mvc *sql, sql_schema *s, const
char *sname, const char *tname, const char *error, bool isView);
+sql_export sql_table *find_table_or_view_on_scope(mvc *sql, sql_schema *s,
const char *sname, const char *tname, const char *error, bool isView);
extern sql_sequence *find_sequence_on_scope(mvc *sql, const char *sname, const
char *name, const char *error);
extern sql_idx *find_idx_on_scope(mvc *sql, const char *sname, const char
*name, const char *error);
extern sql_type *find_type_on_scope(mvc *sql, const char *sname, const char
*name, const char *error);
@@ -31,7 +31,7 @@ extern sql_trigger *find_trigger_on_scop
extern bool find_variable_on_scope(mvc *sql, const char *sname, const char
*name, sql_var **var, sql_arg **a, sql_subtype **tpe, int *level, const char
*error);
/* These functions find catalog functions according to scoping rules */
-sql_export sql_subfunc *sql_find_func(mvc *sql, const char *sname, const char
*fname, int nrargs, sql_ftype type, sql_subfunc *prev);
+extern sql_subfunc *sql_find_func(mvc *sql, const char *sname, const char
*fname, int nrargs, sql_ftype type, sql_subfunc *prev);
extern sql_subfunc *sql_bind_member(mvc *sql, const char *sname, const char
*fname, sql_subtype *tp, sql_ftype type, int nrargs, sql_subfunc *prev);
extern sql_subfunc *sql_bind_func(mvc *sql, const char *sname, const char
*fname, sql_subtype *tp1, sql_subtype *tp2, sql_ftype type);
extern sql_subfunc *sql_bind_func3(mvc *sql, const char *sname, const char
*fname, sql_subtype *tp1, sql_subtype *tp2, sql_subtype *tp3, sql_ftype type);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
