Changeset: 26d29a501f37 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=26d29a501f37
Modified Files:
gdk/Makefile.ag
monetdb5/mal/mal_parser.c
sql/backends/monet5/sql_execute.c
Branch: mlogger
Log Message:
Modified includes - compilation error
diffs (46 lines):
diff --git a/gdk/Makefile.ag b/gdk/Makefile.ag
--- a/gdk/Makefile.ag
+++ b/gdk/Makefile.ag
@@ -8,10 +8,6 @@ MTSAFE
INCLUDES = ../common/options ../common/stream ../common/utils
$(valgrind_CFLAGS)
-lib_gdktracer = {
- SOURCES = gdk_tracer.c gdk_tracer.h
-}
-
lib_gdk = {
VERSION = $(GDK_VERSION)
NAME = bat
diff --git a/monetdb5/mal/mal_parser.c b/monetdb5/mal/mal_parser.c
--- a/monetdb5/mal/mal_parser.c
+++ b/monetdb5/mal/mal_parser.c
@@ -10,7 +10,6 @@
*/
#include "monetdb_config.h"
-#include "gdk_tracer.h"
#include "mal_parser.h"
#include "mal_resolve.h"
#include "mal_linker.h"
@@ -22,6 +21,7 @@
#include "mal_builder.h"
#include "mal_type.h"
#include "mal_private.h"
+#include "gdk_tracer.h"
#define FATALINPUT MAXERRORS+1
#define NL(X) ((X)=='\n' || (X)=='\r')
diff --git a/sql/backends/monet5/sql_execute.c
b/sql/backends/monet5/sql_execute.c
--- a/sql/backends/monet5/sql_execute.c
+++ b/sql/backends/monet5/sql_execute.c
@@ -15,8 +15,8 @@
* Before we are can process SQL statements the global catalog should be
initialized.
*/
#include "monetdb_config.h"
+#include "mal_backend.h"
#include "gdk_tracer.h"
-#include "mal_backend.h"
#include "sql_scenario.h"
#include "sql_result.h"
#include "sql_gencode.h"
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
