MonetDB: Oct2014 - Use Stream instead of stream** to help my che...

[Sjoerd Mullender]

Changeset: ee3601cf9d7e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ee3601cf9d7e
Modified Files:
        clients/Tests/exports.stable.out
        monetdb5/modules/mal/mal_mapi.c
        monetdb5/modules/mal/mal_mapi.h
Branch: Oct2014
Log Message:

Use Stream instead of stream** to help my check script.


diffs (44 lines):

diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -1902,7 +1902,7 @@ str SABretreatScenario(void *ret, str *l
 str SAMPLEuniform(bat *r, bat *b, wrd *s);
 str SAMPLEuniform_dbl(bat *r, bat *b, dbl *p);
 str SERVERbindBAT(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str SERVERclient(void *res, stream **In, stream **Out);
+str SERVERclient(void *res, const Stream *In, const Stream *Out);
 str SERVERconnect(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pc);
 str SERVERdestroy(void *ret, int *mid);
 str SERVERdisconnect(void *ret, int *mid);
diff --git a/monetdb5/modules/mal/mal_mapi.c b/monetdb5/modules/mal/mal_mapi.c
--- a/monetdb5/modules/mal/mal_mapi.c
+++ b/monetdb5/modules/mal/mal_mapi.c
@@ -677,7 +677,7 @@ SERVERresume(void *res)
 }
 
 str
-SERVERclient(void *res, stream **In, stream **Out)
+SERVERclient(void *res, const Stream *In, const Stream *Out)
 {
        (void) res;
        /* in embedded mode we allow just one client */
diff --git a/monetdb5/modules/mal/mal_mapi.h b/monetdb5/modules/mal/mal_mapi.h
--- a/monetdb5/modules/mal/mal_mapi.h
+++ b/monetdb5/modules/mal/mal_mapi.h
@@ -29,6 +29,7 @@
 #include "msabaoth.h"
 #include "mcrypt.h"
 #include <stream.h>
+#include "streams.h"                   /* for Stream */
 
 #ifdef WIN32
 #if !defined(LIBMAL) && !defined(LIBATOMS) && !defined(LIBKERNEL) && 
!defined(LIBMAL) && !defined(LIBOPTIMIZER) && !defined(LIBSCHEDULER) && 
!defined(LIBMONETDB5)
@@ -97,7 +98,7 @@ mal_mapi_export str SERVERmapi_rpc_singl
 mal_mapi_export str SERVERput(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr pci);
 mal_mapi_export str SERVERputLocal(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr pci);
 mal_mapi_export str SERVERbindBAT(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr pci);
-mal_mapi_export str SERVERclient(void *res, stream **In, stream **Out);
+mal_mapi_export str SERVERclient(void *res, const Stream *In, const Stream 
*Out);
 mal_mapi_export str SERVERmapi_rpc_bat(Client cntxt, MalBlkPtr mb, MalStkPtr 
stk, InstrPtr pci);
 
 #endif /* SERVER_H */
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list