Changeset: 224dbbbb1fb4 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=224dbbbb1fb4
Modified Files:
monetdb5/extras/jaql/jaql.h
monetdb5/extras/jaql/jaqltree.h
Branch: default
Log Message:
jaqltree.h: move printtree declaration to jaql.h due to stream
It seems various compilers think differently about (identical)
redefinitions (of in this case stream), so move printtree to jaql.h,
since it's not necessary by the parser/lexer, where we cannot include
monetdb_config.h, which is necessary to be able to include stream.h.
diffs (39 lines):
diff --git a/monetdb5/extras/jaql/jaql.h b/monetdb5/extras/jaql/jaql.h
--- a/monetdb5/extras/jaql/jaql.h
+++ b/monetdb5/extras/jaql/jaql.h
@@ -20,6 +20,7 @@
#ifndef JAQL_H
#define JAQL_H 1
+#include "stream.h"
#include "mal_client.h"
#include "jaqltree.h"
@@ -34,6 +35,7 @@
#endif
str getJAQLContext(Client cntxt, jc **c);
+void printtree(stream *out, tree *t, int level, char op);
jaql_export str JAQLexecute(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
diff --git a/monetdb5/extras/jaql/jaqltree.h b/monetdb5/extras/jaql/jaqltree.h
--- a/monetdb5/extras/jaql/jaqltree.h
+++ b/monetdb5/extras/jaql/jaqltree.h
@@ -20,8 +20,6 @@
#ifndef JAQLTREE_H
#define JAQLTREE_H 1
-typedef struct stream stream;
-
typedef struct _jvar {
char *vname;
int kind;
@@ -156,7 +154,6 @@ tree *make_func_call(char *name, tree *a
tree *make_func_arg(tree *arg);
tree *append_func_arg(tree *oarg, tree *narg);
tree *set_func_input_from_pipe(tree *func);
-void printtree(stream *out, tree *t, int level, char op);
void freetree(tree *t);
void freevars(jvar *v);
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
