MonetDB: default - fix problems after testweb run

[Arjen de Rijke]

Changeset: c1b8e47a2d34 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c1b8e47a2d34
Modified Files:
        monetdb5/mal/mal_http_daemon.c
        monetdb5/modules/atoms/mcurl.c
        sql/backends/monet5/rest/Makefile.ag
Branch: default
Log Message:

fix problems after testweb run


diffs (39 lines):

diff --git a/monetdb5/mal/mal_http_daemon.c b/monetdb5/mal/mal_http_daemon.c
--- a/monetdb5/mal/mal_http_daemon.c
+++ b/monetdb5/mal/mal_http_daemon.c
@@ -19,6 +19,7 @@
 
 #include "monetdb_config.h"
 
+#ifdef HAVE_MICROHTTPD
 #include <sys/types.h>
 #include <sys/select.h>
 #include <sys/socket.h>
@@ -28,7 +29,6 @@
 
 #include "mal_client.h"
 #include "mal_http_daemon.h"
-#ifdef HAVE_MICROHTTPD
 #include <microhttpd.h>
 
 static MT_Id hdthread;
diff --git a/monetdb5/modules/atoms/mcurl.c b/monetdb5/modules/atoms/mcurl.c
--- a/monetdb5/modules/atoms/mcurl.c
+++ b/monetdb5/modules/atoms/mcurl.c
@@ -113,7 +113,7 @@ handle_get_request(str *retval, str *url
                 * should free() it as a nice application.
                 */
 
-               printf("%lu bytes retrieved\n", (long)chunk.size);
+               //printf("%lu bytes retrieved\n", (long)chunk.size);
        }
        if (chunk.size) {
                d = GDKstrdup(chunk.memory);
diff --git a/sql/backends/monet5/rest/Makefile.ag 
b/sql/backends/monet5/rest/Makefile.ag
--- a/sql/backends/monet5/rest/Makefile.ag
+++ b/sql/backends/monet5/rest/Makefile.ag
@@ -62,4 +62,3 @@ headers_restautoload = {
 }
 
 EXTRA_DIST = 73_jsonstore.mal jsonstore.mal rest_jsonstore.h
-EXTRA_DIST_DIR = Tests
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list