Changeset: b22c07bd5c6d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/b22c07bd5c6d
Modified Files:
clients/mapiclient/mclient.c
common/stream/iconv_stream.c
common/stream/stdio_stream.c
common/utils/msabaoth.c
gdk/gdk.h
geom/lib/libgeom.h
monetdb5/mal/mal.h
monetdb5/modules/mal/mal_mapi.c
monetdb5/modules/mal/remote.c
monetdb_config.h.in
sql/server/rel_basetable.c
Branch: default
Log Message:
Removed a bunch of old symbols.
They used to be discovered by configure, but now they are set to fixed
values.
diffs (192 lines):
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -3678,7 +3678,7 @@ main(int argc, char **argv)
if (encoding != NULL &&
(cd_in = iconv_open("utf-8", encoding)) != (iconv_t) -1) {
char *savecommand = command;
- ICONV_CONST char *from = command;
+ char *from = command;
size_t fromlen = strlen(from);
int factor = 4;
size_t tolen = factor * fromlen + 1;
diff --git a/common/stream/iconv_stream.c b/common/stream/iconv_stream.c
--- a/common/stream/iconv_stream.c
+++ b/common/stream/iconv_stream.c
@@ -31,7 +31,7 @@ static ssize_t
ic_write(stream *restrict s, const void *restrict buf, size_t elmsize, size_t
cnt)
{
struct icstream *ic = (struct icstream *) s->stream_data.p;
- ICONV_CONST char *inbuf;
+ char *inbuf;
size_t inbytesleft = elmsize * cnt;
char *bf = NULL;
@@ -55,7 +55,7 @@ ic_write(stream *restrict s, const void
inbytesleft += ic->buflen;
ic->buflen = 0;
}
- inbuf = (ICONV_CONST char *) buf;
+ inbuf = (char *) buf;
while (inbytesleft > 0) {
char *outbuf = ic->buffer;
size_t outbytesleft = sizeof(ic->buffer);
@@ -116,7 +116,7 @@ static ssize_t
ic_read(stream *restrict s, void *restrict buf, size_t elmsize, size_t cnt)
{
struct icstream *ic = (struct icstream *) s->stream_data.p;
- ICONV_CONST char *inbuf;
+ char *inbuf;
size_t inbytesleft;
char *outbuf;
size_t outbytesleft;
diff --git a/common/stream/stdio_stream.c b/common/stream/stdio_stream.c
--- a/common/stream/stdio_stream.c
+++ b/common/stream/stdio_stream.c
@@ -264,7 +264,7 @@ cvfilename(const char *filename)
if (cd != (iconv_t) -1) {
size_t len = strlen(filename);
size_t size = 4 * len;
- ICONV_CONST char *from = (ICONV_CONST char *) filename;
+ char *from = (char *) filename;
char *r = malloc(size + 1);
char *p = r;
diff --git a/common/utils/msabaoth.c b/common/utils/msabaoth.c
--- a/common/utils/msabaoth.c
+++ b/common/utils/msabaoth.c
@@ -191,7 +191,7 @@ msab_init(const char *dbfarm, const char
if ((d = opendir(tmp)) != NULL) {
struct dbe {
struct dbe *next;
- char path[FLEXIBLE_ARRAY_MEMBER];
+ char path[];
} *dbe = NULL, *db;
struct dirent *e;
len = offsetof(struct dbe, path) + strlen(tmp) + 2;
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -489,7 +489,7 @@ typedef union {
typedef struct {
size_t nitems;
- char data[FLEXIBLE_ARRAY_MEMBER] __attribute__((__nonstring__));
+ char data[] __attribute__((__nonstring__));
} blob;
gdk_export size_t blobsize(size_t nitems) __attribute__((__const__));
@@ -2455,7 +2455,7 @@ typedef struct gdk_callback {
lng last_called; // timestamp GDKusec
gdk_return (*func)(int argc, void *argv[]);
struct gdk_callback *next;
- void *argv[FLEXIBLE_ARRAY_MEMBER];
+ void *argv[];
} gdk_callback;
typedef gdk_return gdk_callback_func(int argc, void *argv[]);
diff --git a/geom/lib/libgeom.h b/geom/lib/libgeom.h
--- a/geom/lib/libgeom.h
+++ b/geom/lib/libgeom.h
@@ -112,12 +112,12 @@ libgeom_export const char *geom_type2str
typedef struct wkb {
int len;
int srid;
- char data[FLEXIBLE_ARRAY_MEMBER];
+ char data[];
} wkb;
typedef struct wkba {
int itemsNum; //the number of wkbs
- wkb* data[FLEXIBLE_ARRAY_MEMBER]; //the wkbs
+ wkb* data[]; //the wkbs
} wkba;
typedef struct {
diff --git a/monetdb5/mal/mal.h b/monetdb5/mal/mal.h
--- a/monetdb5/mal/mal.h
+++ b/monetdb5/mal/mal.h
@@ -159,7 +159,7 @@ typedef struct {
const char *modname; /* module context, reference into
namespace */
const char *fcnname; /* function name, reference into
namespace */
int argc, retc, maxarg; /* total and result argument count */
- int argv[FLEXIBLE_ARRAY_MEMBER]; /* at least a few entries */
+ int argv[]; /* at least a few
entries */
} *InstrPtr, InstrRecord;
typedef struct MALBLK {
@@ -226,7 +226,7 @@ typedef struct MALSTK {
struct MALSTK *up; /* stack trace list */
struct MALBLK *blk; /* associated definition */
- ValRecord stk[FLEXIBLE_ARRAY_MEMBER];
+ ValRecord stk[];
} MalStack, *MalStkPtr;
#endif /* _MAL_H */
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
@@ -31,7 +31,6 @@
* the module remote.
*/
#include "monetdb_config.h"
-#ifdef HAVE_MAPI
#include "mal_client.h"
#include "mal_session.h"
#include "mal_exception.h"
@@ -2141,8 +2140,3 @@ mel_func mal_mapi_init_funcs[] = {
#endif
LIB_STARTUP_FUNC(init_mal_mapi_mal)
{ mal_module2("mapi", NULL, mal_mapi_init_funcs, MAPIprelude, NULL); }
-
-#else
-// this avoids a compiler warning w.r.t. empty compilation units.
-int SERVERdummy = 42;
-#endif // HAVE_MAPI
diff --git a/monetdb5/modules/mal/remote.c b/monetdb5/modules/mal/remote.c
--- a/monetdb5/modules/mal/remote.c
+++ b/monetdb5/modules/mal/remote.c
@@ -69,9 +69,6 @@
* Instead, we maintain a simple lock with each connection, which can be
* used to issue a safe, but blocking get/put/exec/register request.
*/
-#ifdef HAVE_MAPI
-
-
#include "mal_exception.h"
#include "mal_interpreter.h"
#include "mal_function.h" /* for printFunction */
@@ -1703,5 +1700,3 @@ mel_func remote_init_funcs[] = {
#endif
LIB_STARTUP_FUNC(init_remote_mal)
{ mal_module2("remote", NULL, remote_init_funcs, RMTprelude, NULL); }
-
-#endif
diff --git a/monetdb_config.h.in b/monetdb_config.h.in
--- a/monetdb_config.h.in
+++ b/monetdb_config.h.in
@@ -171,11 +171,6 @@
#cmakedefine HAVE_PTHREAD_KILL 1
#cmakedefine HAVE_PTHREAD_SIGMASK 1
#cmakedefine HAVE_GETOPT 1
-
-#define ICONV_CONST
-#define FLEXIBLE_ARRAY_MEMBER
-#define ENABLE_MAPI 1
-#define HAVE_MAPI 1
// End Section: monetdb configure defines
// Section: monetdb macro variables
diff --git a/sql/server/rel_basetable.c b/sql/server/rel_basetable.c
--- a/sql/server/rel_basetable.c
+++ b/sql/server/rel_basetable.c
@@ -24,7 +24,7 @@ typedef struct rel_base_t {
sql_table *mt;
char *name;
int disallowed; /* ie check per column */
- uint32_t used[FLEXIBLE_ARRAY_MEMBER];
+ uint32_t used[];
} rel_base_t;
void
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
