MonetDB: default - Merge with Jul2015 branch.

[Stefan Manegold]

Changeset: c5b2283bd0d9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c5b2283bd0d9
Modified Files:
        clients/mapiclient/eventparser.c
        clients/mapiclient/eventparser.h
        monetdb5/modules/mal/manifold.h
        sql/backends/monet5/embeddedclient.c.in
        sql/backends/monet5/embeddedclient.h
        sql/backends/monet5/prog.c
Branch: default
Log Message:

Merge with Jul2015 branch.


diffs (67 lines):

diff --git a/clients/mapiclient/eventparser.c b/clients/mapiclient/eventparser.c
--- a/clients/mapiclient/eventparser.c
+++ b/clients/mapiclient/eventparser.c
@@ -8,6 +8,7 @@
 
 /* (c) M Kersten */
 
+#include "monetdb_config.h"
 #include "eventparser.h"
 
 char *statenames[]= {"","start","done","action","ping","wait","system"};
diff --git a/clients/mapiclient/eventparser.h b/clients/mapiclient/eventparser.h
--- a/clients/mapiclient/eventparser.h
+++ b/clients/mapiclient/eventparser.h
@@ -19,8 +19,6 @@
 #ifndef _EVENT_PARSER_
 #define _EVENT_PARSER_
 
-#include "monetdb_config.h"
-#include "monet_options.h"
 #include <mapi.h>
 #include <stream.h>
 #include <stdio.h>
diff --git a/monetdb5/modules/mal/manifold.h b/monetdb5/modules/mal/manifold.h
--- a/monetdb5/modules/mal/manifold.h
+++ b/monetdb5/modules/mal/manifold.h
@@ -12,7 +12,6 @@
  */
 #ifndef _MANIFOLD_LIB_
 #define _MANIFOLD_LIB_
-#include "monetdb_config.h"
 #include <string.h>
 
 #include "mal.h"
diff --git a/sql/backends/monet5/embeddedclient.c.in 
b/sql/backends/monet5/embeddedclient.c.in
--- a/sql/backends/monet5/embeddedclient.c.in
+++ b/sql/backends/monet5/embeddedclient.c.in
@@ -26,7 +26,6 @@
 #include <monetdb_config.h>
 #include "gdk.h"
 #include "embeddedclient.h"
-#include "monet_options.h"
 
 #ifdef HAVE_PTHREAD_H
 /* pthread.h on Windows includes config.h if HAVE_CONFIG_H is set */
diff --git a/sql/backends/monet5/embeddedclient.h 
b/sql/backends/monet5/embeddedclient.h
--- a/sql/backends/monet5/embeddedclient.h
+++ b/sql/backends/monet5/embeddedclient.h
@@ -23,7 +23,6 @@
 #include <stdio.h>
 #include <stream.h>
 #include <mapi.h>
-#include <monet_options.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/sql/backends/monet5/prog.c b/sql/backends/monet5/prog.c
--- a/sql/backends/monet5/prog.c
+++ b/sql/backends/monet5/prog.c
@@ -7,6 +7,7 @@
  */
 
 #include <monetdb_config.h>
+#include "monet_options.h"
 #include "embeddedclient.h"
 
 #ifdef HAVE_STRING_H
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list