Changeset: 0b041e943c83 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0b041e943c83
Modified Files:
sql/backends/monet5/sql_result.h
sql/common/sql_types.h
sql/include/sql_mem.h
sql/server/rel_exp.h
sql/server/rel_rel.h
sql/server/sql_qc.h
Branch: monetdbe-proxy
Log Message:
Add import/export attributes to make Windows love me.
diffs (75 lines):
diff --git a/sql/backends/monet5/sql_result.h b/sql/backends/monet5/sql_result.h
--- a/sql/backends/monet5/sql_result.h
+++ b/sql/backends/monet5/sql_result.h
@@ -26,9 +26,9 @@ extern int mvc_export_chunk(backend *b,
extern int mvc_export_prepare(backend *b, stream *s, str w);
extern str mvc_import_table(Client cntxt, BAT ***bats, mvc *c, bstream *s,
sql_table *t, const char *sep, const char *rsep, const char *ssep, const char
*ns, lng nr, lng offset, int locked, int best, bool from_stdin, bool escape);
-extern int mvc_result_table(backend *be, oid query_id, int nr_cols,
mapi_query_t type, BAT *order);
+sql5_export int mvc_result_table(backend *be, oid query_id, int nr_cols,
mapi_query_t type, BAT *order);
-extern int mvc_result_column(backend *be, char *tn, char *name, char
*typename, int digits, int scale, BAT *b);
+sql5_export int mvc_result_column(backend *be, char *tn, char *name, char
*typename, int digits, int scale, BAT *b);
extern int mvc_result_value(backend *be, const char *tn, const char *name,
const char *typename, int digits, int scale, ptr *p, int mtype);
extern ssize_t convert2str(mvc *m, sql_class eclass, int d, int sc, int
has_tz, ptr p, int mtype, char **buf, size_t *len);
diff --git a/sql/common/sql_types.h b/sql/common/sql_types.h
--- a/sql/common/sql_types.h
+++ b/sql/common/sql_types.h
@@ -37,7 +37,7 @@ extern sql_subtype *sql_find_numeric(sql
extern sql_subtype *sql_bind_subtype(sql_allocator *sa, const char *name,
unsigned int digits, unsigned int scale);
extern sql_subtype *sql_bind_localtype(const char *name);
extern sql_subtype *sql_create_subtype(sql_allocator *sa, sql_type *t,
unsigned int s, unsigned int d);
-extern void sql_init_subtype(sql_subtype *res, sql_type *t, unsigned int
digits, unsigned int scale);
+sql_export void sql_init_subtype(sql_subtype *res, sql_type *t, unsigned int
digits, unsigned int scale);
extern int type_cmp(sql_type *t1, sql_type *t2);
extern int subtype_cmp(sql_subtype *t1, sql_subtype *t2);
diff --git a/sql/include/sql_mem.h b/sql/include/sql_mem.h
--- a/sql/include/sql_mem.h
+++ b/sql/include/sql_mem.h
@@ -56,7 +56,7 @@ typedef struct sql_allocator {
sql_export sql_allocator *sa_create( sql_allocator *pa );
sql_export sql_allocator *sa_reset( sql_allocator *sa );
extern void *sa_alloc( sql_allocator *sa, size_t sz );
-extern void *sa_zalloc( sql_allocator *sa, size_t sz );
+sql_export void *sa_zalloc( sql_allocator *sa, size_t sz );
extern void *sa_realloc( sql_allocator *sa, void *ptr, size_t sz, size_t osz
);
extern void sa_destroy( sql_allocator *sa );
extern char *sa_strndup( sql_allocator *sa, const char *s, size_t l);
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
@@ -43,7 +43,7 @@ extern sql_exp *exp_compare_func(mvc *sq
#define exp_fromtype(e) ((list*)e->r)->h->data
#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 );
-extern str number2name(str s, int len, int i);
+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_rank_op(sql_allocator *sa, list *largs, list *gbe, list
*obe, sql_subfunc *f );
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
@@ -93,7 +93,7 @@ extern sql_exp *rel_groupby_add_aggr(mvc
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_groupby(mvc *sql, sql_rel *l, list *groupbyexps );
-extern sql_rel *rel_project(sql_allocator *sa, sql_rel *l, list *e);
+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);
diff --git a/sql/server/sql_qc.h b/sql/server/sql_qc.h
--- a/sql/server/sql_qc.h
+++ b/sql/server/sql_qc.h
@@ -42,7 +42,7 @@ extern qc *qc_create(sql_allocator *sa,
extern void qc_clean(qc *cache);
extern void qc_destroy(qc *cache);
sql_export cq *qc_find(qc *cache, int id);
-extern cq *qc_insert(qc *cache, sql_allocator *sa, sql_rel *r, symbol *s, list
*params, mapi_query_t type, char *codedstr, int no_mitosis);
+sql_export cq *qc_insert(qc *cache, sql_allocator *sa, sql_rel *r, symbol *s,
list *params, mapi_query_t type, char *codedstr, int no_mitosis);
sql_export void qc_delete(qc *cache, cq *q);
extern int qc_size(qc *cache);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
