Changeset: faad9d513791 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=faad9d513791
Modified Files:
clients/mapilib/mapi.c
monetdb5/mal/mal_debugger.c
monetdb5/mal/mal_session.c
Branch: Jun2016
Log Message:
Compilation fixes for -enable-embedded.
(grafted from fe7abdbaaca7ca079cb9e73c32f669924beeff77)
diffs (46 lines):
diff --git a/clients/mapilib/mapi.c b/clients/mapilib/mapi.c
--- a/clients/mapilib/mapi.c
+++ b/clients/mapilib/mapi.c
@@ -959,7 +959,7 @@ struct MapiStatement {
#endif
#ifdef HAVE_EMBEDDED
-#define printf //
+#define printf(...) ((void)0)
#endif
/*
diff --git a/monetdb5/mal/mal_debugger.c b/monetdb5/mal/mal_debugger.c
--- a/monetdb5/mal/mal_debugger.c
+++ b/monetdb5/mal/mal_debugger.c
@@ -386,7 +386,6 @@ mdbCommand(Client cntxt, MalBlkPtr mb, M
int stepsize = 10;
char oldcmd[1024] = { 0 };
do {
- int r;
if (p != NULL) {
if (cntxt != mal_clients)
/* help mclients with fake prompt */
@@ -417,8 +416,7 @@ retryRead:
#ifndef HAVE_EMBEDDED
else if (cntxt == mal_clients) {
/* switch to mdb streams */
- r = readConsole(cntxt);
- if (r <= 0)
+ if (readConsole(cntxt) <= 0)
break;
}
#endif
diff --git a/monetdb5/mal/mal_session.c b/monetdb5/mal/mal_session.c
--- a/monetdb5/mal/mal_session.c
+++ b/monetdb5/mal/mal_session.c
@@ -517,8 +517,8 @@ MALexitClient(Client c)
str
MALreader(Client c)
{
+#ifndef HAVE_EMBEDDED
int r = 1;
-#ifndef HAVE_EMBEDDED
if (c == mal_clients) {
r = readConsole(c);
if (r < 0 && c->fdin->eof == 0)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
