Changeset: 685da645d088 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/685da645d088
Modified Files:
monetdb5/mal/mal_client.h
monetdb5/mal/mal_scenario.c
monetdb5/mal/mal_scenario.h
Branch: Jun2023
Log Message:
fix compilation, use proper function definition for exit_client
diffs (44 lines):
diff --git a/monetdb5/mal/mal_client.h b/monetdb5/mal/mal_client.h
--- a/monetdb5/mal/mal_client.h
+++ b/monetdb5/mal/mal_client.h
@@ -46,6 +46,7 @@ typedef struct CLIENT_INPUT {
struct CLIENT;
typedef str (*init_client)(struct CLIENT *, const char *, const char *, const
char *);
+typedef str (*exit_client)(struct CLIENT *);
typedef void (*engine_fptr)(struct CLIENT *);
typedef struct CLIENT {
@@ -63,7 +64,7 @@ typedef struct CLIENT {
str scenario; /* scenario management references */
engine_fptr engine;
init_client initClient;
- MALfcn exitClient;
+ exit_client exitClient;
/* if set to 'S' it will put
the process to sleep */
bit sqlprofiler; /* control off-line sql
performance monitoring */
/*
diff --git a/monetdb5/mal/mal_scenario.c b/monetdb5/mal/mal_scenario.c
--- a/monetdb5/mal/mal_scenario.c
+++ b/monetdb5/mal/mal_scenario.c
@@ -80,7 +80,7 @@ static struct SCENARIO scenarioRec[MAXSC
.initClient = "MALinitClient",
.initClientCmd = (init_client) MALinitClient,
.exitClient = "MALexitClient",
- .exitClientCmd = (MALfcn) MALexitClient,
+ .exitClientCmd = (exit_client) MALexitClient,
.engine = "MALengine",
.engineCmd = (engine_fptr)MALengine,
},
diff --git a/monetdb5/mal/mal_scenario.h b/monetdb5/mal/mal_scenario.h
--- a/monetdb5/mal/mal_scenario.h
+++ b/monetdb5/mal/mal_scenario.h
@@ -28,7 +28,7 @@ typedef struct SCENARIO {
str initClient;
init_client initClientCmd;
str exitClient;
- MALfcn exitClientCmd;
+ exit_client exitClientCmd;
str engine;
engine_fptr engineCmd;
} *Scenario;
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
