MonetDB: default - Unexport stuff in mal_runtime.h.

[Sjoerd Mullender]

Changeset: 0d52f445a733 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/0d52f445a733
Modified Files:
        clients/Tests/exports.stable.out
        monetdb5/mal/mal_runtime.h
Branch: default
Log Message:

Unexport stuff in mal_runtime.h.
mal_runtime.h does not get installed, so this stuff was never available
anyway.


diffs (93 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
@@ -789,7 +789,6 @@ str QLOGempty(void *ret);
 str QLOGenable(void *ret);
 str QLOGenableThreshold(void *ret, int *threshold);
 int QLOGisset(void);
-QueryQueue QRYqueue;
 str RMTdisconnect(void *ret, str *conn);
 BUN SQLload_file(Client cntxt, Tablet *as, bstream *b, stream *out, const char 
*csep, const char *rsep, char quote, lng skip, lng maxrow, int best, bool 
from_stdin, const char *tabnam, bool escape);
 str TABLETcollect(BAT **bats, Tablet *as);
@@ -799,7 +798,6 @@ void TABLETdestroy_format(Tablet *as);
 int TABLEToutput_file(Tablet *as, BAT *order, stream *s);
 int TRACEtable(Client cntxt, BAT **r);
 int TYPE_xml;
-UserStats USRstats;
 InstrPtr addArgument(MalBlkPtr mb, InstrPtr p, int varid);
 void addMalException(MalBlkPtr mb, str msg);
 str addOptimizerPipe(Client cntxt, MalBlkPtr mb, const char *name);
@@ -962,7 +960,6 @@ MALfcn getAddress(const char *modname, c
 str getArgDefault(MalBlkPtr mb, InstrPtr p, int idx);
 ptr getArgReference(MalStkPtr stk, InstrPtr pci, int k);
 int getAtomIndex(const char *nme, size_t len, int deftpe);
-lng getBatSpace(BAT *b);
 int getBitConstant(MalBlkPtr mb, bit val);
 int getBlockBegin(MalBlkPtr mb, int pc);
 int getBlockExit(MalBlkPtr mb, int pc);
@@ -1006,7 +1003,6 @@ str getTypeName(malType tpe);
 lng getUserTime(void);
 char *getVarName(MalBlkPtr mb, int idx);
 const char *getVariableRef;
-lng getVolume(MalStkPtr stk, InstrPtr pci, int rd);
 int getprofilerlimit(void);
 Module globalModule(const char *nme);
 const char *grantRef;
@@ -1249,10 +1245,6 @@ str runMALDebugger(Client cntxt, MalBlkP
 str runMALdataflow(Client cntxt, MalBlkPtr mb, int startpc, int stoppc, 
MalStkPtr stk);
 str runMALsequence(Client cntxt, MalBlkPtr mb, int startpc, int stoppc, 
MalStkPtr stk, MalStkPtr env, InstrPtr pcicaller);
 str runScenario(Client c, int once);
-void runtimeProfileBegin(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr 
pci, RuntimeProfile prof);
-void runtimeProfileExit(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr 
pci, RuntimeProfile prof);
-void runtimeProfileFinish(Client cntxt, MalBlkPtr mb, MalStkPtr stk);
-void runtimeProfileInit(Client cntxt, MalBlkPtr mb, MalStkPtr stk);
 oid runtimeProfileSetTag(Client cntxt);
 const char *sampleRef;
 const char *selectNotNilRef;
@@ -1335,9 +1327,7 @@ const char *updateRef;
 void updateScenario(str scen, str nme, MALfcn fcn);
 Module userModule(void);
 const char *userRef;
-size_t usrstatscnt;
 const char *window_boundRef;
-Workingset workingset[THREADS];
 const char *zero_or_oneRef;
 
 # monetdbe
diff --git a/monetdb5/mal/mal_runtime.h b/monetdb5/mal/mal_runtime.h
--- a/monetdb5/mal/mal_runtime.h
+++ b/monetdb5/mal/mal_runtime.h
@@ -51,7 +51,7 @@ typedef struct USERSTAT{
        lng maxticks;
        str maxquery;
 } *UserStats;
-mal_export size_t usrstatscnt;
+extern size_t usrstatscnt;
 
 typedef struct WORKINGSET{
        Client          cntxt;
@@ -60,15 +60,15 @@ typedef struct WORKINGSET{
        InstrPtr    pci;
 } Workingset;
 
-mal_export Workingset workingset[THREADS];
+extern Workingset workingset[THREADS];
 
-mal_export void runtimeProfileInit(Client cntxt, MalBlkPtr mb, MalStkPtr stk);
-mal_export void runtimeProfileFinish(Client cntxt, MalBlkPtr mb, MalStkPtr 
stk);
-mal_export void runtimeProfileBegin(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr pci, RuntimeProfile prof);
-mal_export void runtimeProfileExit(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr pci, RuntimeProfile prof);
-mal_export lng getVolume(MalStkPtr stk, InstrPtr pci, int rd);
-mal_export lng getBatSpace(BAT *b);
+extern void runtimeProfileInit(Client cntxt, MalBlkPtr mb, MalStkPtr stk);
+extern void runtimeProfileFinish(Client cntxt, MalBlkPtr mb, MalStkPtr stk);
+extern void runtimeProfileBegin(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr pci, RuntimeProfile prof);
+extern void runtimeProfileExit(Client cntxt, MalBlkPtr mb, MalStkPtr stk, 
InstrPtr pci, RuntimeProfile prof);
+extern lng getVolume(MalStkPtr stk, InstrPtr pci, int rd);
+extern lng getBatSpace(BAT *b);
 
-mal_export QueryQueue QRYqueue;
-mal_export UserStats USRstats;
+extern QueryQueue QRYqueue;
+extern UserStats USRstats;
 #endif
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org