Changeset: 25a1f64cedee for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/25a1f64cedee
Modified Files:
sql/backends/monet5/vaults/csv/csv.c
sql/common/sql_types.h
sql/include/sql_mem.h
sql/server/rel_exp.h
sql/server/rel_file_loader.h
sql/server/sql_mvc.h
sql/server/sql_semantic.h
Branch: default
Log Message:
export some more symbols for windows
diffs (110 lines):
diff --git a/sql/backends/monet5/vaults/csv/csv.c
b/sql/backends/monet5/vaults/csv/csv.c
--- a/sql/backends/monet5/vaults/csv/csv.c
+++ b/sql/backends/monet5/vaults/csv/csv.c
@@ -159,7 +159,7 @@ detect_decimal(const char *s, const char
while(s < e) {
if (!dotseen && *s == '.')
- dotseen = (e-(s+1));
+ dotseen = (int)(e-(s+1));
else if (!isdigit(*s))
break;
s++;
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
@@ -34,10 +34,10 @@ extern char *sql_bind_alias(const char *
extern sql_subtype *arg_type( sql_arg *a);
-extern int sql_find_subtype(sql_subtype *res, const char *name, unsigned int
digits, unsigned int scale);
+sql_export int sql_find_subtype(sql_subtype *res, const char *name, unsigned
int digits, unsigned int scale);
extern sql_subtype *sql_find_numeric(sql_subtype *r, int localtype, unsigned
int digits);
-extern sql_subtype *sql_bind_subtype(sql_allocator *sa, const char *name,
unsigned int digits, unsigned int scale);
+sql_export 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);
sql_export void sql_init_subtype(sql_subtype *res, sql_type *t, unsigned int
digits, unsigned int scale);
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
@@ -60,7 +60,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 );
+sql_export void *sa_alloc( 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 );
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
@@ -50,7 +50,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);
-extern sql_exp *exp_op(sql_allocator *sa, list *l, sql_subfunc *f );
+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 );
#define append(l,v) list_append(l,v)
@@ -74,17 +74,17 @@ extern sql_exp * exp_atom_max(sql_alloca
extern sql_exp * exp_atom_bool(sql_allocator *sa, int b);
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);
-extern sql_exp * exp_atom_lng(sql_allocator *sa, lng l);
+sql_export 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_oid(sql_allocator *sa, oid i);
#ifdef HAVE_HGE
extern sql_exp * exp_atom_hge(sql_allocator *sa, hge l);
#endif
extern sql_exp * exp_atom_flt(sql_allocator *sa, flt f);
extern sql_exp * exp_atom_dbl(sql_allocator *sa, dbl d);
-extern sql_exp * exp_atom_str(sql_allocator *sa, const char *s, sql_subtype
*st);
+sql_export sql_exp * exp_atom_str(sql_allocator *sa, const char *s,
sql_subtype *st);
extern sql_exp * exp_atom_clob(sql_allocator *sa, const char *s);
-extern sql_exp * exp_atom_ptr(sql_allocator *sa, void *s);
+sql_export sql_exp * exp_atom_ptr(sql_allocator *sa, void *s);
extern sql_exp * exp_atom_ref(sql_allocator *sa, int i, sql_subtype *tpe);
extern sql_exp * exp_null(sql_allocator *sa, sql_subtype *tpe);
extern sql_exp * exp_zero(sql_allocator *sa, sql_subtype *tpe); /* Apply it to
numeric types only obviously */
diff --git a/sql/server/rel_file_loader.h b/sql/server/rel_file_loader.h
--- a/sql/server/rel_file_loader.h
+++ b/sql/server/rel_file_loader.h
@@ -22,7 +22,7 @@ typedef struct file_loader_t {
fl_load_fptr load;
} file_loader_t;
-extern int fl_register(char *name, fl_add_types_fptr add_types, fl_load_fptr
fl_load);
+sql_export int fl_register(char *name, fl_add_types_fptr add_types,
fl_load_fptr fl_load);
extern file_loader_t* fl_find(char *name);
extern void fl_exit(void);
diff --git a/sql/server/sql_mvc.h b/sql/server/sql_mvc.h
--- a/sql/server/sql_mvc.h
+++ b/sql/server/sql_mvc.h
@@ -215,7 +215,7 @@ extern int mvc_drop_schema(mvc *c, sql_s
extern int mvc_create_schema(mvc *m, const char *name, sqlid auth_id, sqlid
owner);
extern BUN mvc_clear_table(mvc *m, sql_table *t);
extern str mvc_drop_table(mvc *c, sql_schema *s, sql_table * t, int
drop_action);
-extern int mvc_create_table(sql_table **t, mvc *m, sql_schema *s, const char
*name, int tt, bit system, int persistence, int commit_action, int sz, bit
properties);
+sql_export int mvc_create_table(sql_table **t, mvc *m, sql_schema *s, const
char *name, int tt, bit system, int persistence, int commit_action, int sz, bit
properties);
extern int mvc_create_view(sql_table **t, mvc *m, sql_schema *s, const char
*name, int persistence, const char *sql, bit system);
extern int mvc_create_remote(sql_table **t, mvc *m, sql_schema *s, const char
*name, int persistence, const char *loc);
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
@@ -34,7 +34,7 @@ extern bool find_variable_on_scope(mvc *
/* These functions find catalog functions according to scoping rules */
/* The private flag tells to attempt to bind functions that cannot be seen by
users */
-extern sql_subfunc *sql_find_func(mvc *sql, const char *sname, const char
*fname, int nrargs, sql_ftype type, bool private, sql_subfunc *prev);
+sql_export sql_subfunc *sql_find_func(mvc *sql, const char *sname, const char
*fname, int nrargs, sql_ftype type, bool private, 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, bool private, 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, bool private);
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,
bool private);
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
