Changeset: 22042dc96396 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/22042dc96396
Modified Files:
clients/mapiclient/curl-stream.h
clients/mapiclient/dotmonetdb.h
clients/mapiclient/iconv-stream.h
clients/mapiclient/mhelp.h
clients/mapiclient/msqldump.h
clients/mapilib/mapi.h
clients/mapilib/mapi_intern.h
clients/mapilib/msettings.h
clients/mapilib/msettings_internal.h
Branch: default
Log Message:
Add #include to include files to improve editing experience (syntax checking).
diffs (125 lines):
diff --git a/clients/mapiclient/curl-stream.h b/clients/mapiclient/curl-stream.h
--- a/clients/mapiclient/curl-stream.h
+++ b/clients/mapiclient/curl-stream.h
@@ -9,6 +9,7 @@
*/
#include <curl/curl.h>
+#include "stream.h"
#ifndef CURL_WRITEFUNC_ERROR
#define CURL_WRITEFUNC_ERROR 0
diff --git a/clients/mapiclient/dotmonetdb.h b/clients/mapiclient/dotmonetdb.h
--- a/clients/mapiclient/dotmonetdb.h
+++ b/clients/mapiclient/dotmonetdb.h
@@ -8,6 +8,8 @@
* For copyright information, see the file debian/copyright.
*/
+#include <stdbool.h>
+
typedef struct DotMonetdb {
char *user;
char *passwd;
diff --git a/clients/mapiclient/iconv-stream.h
b/clients/mapiclient/iconv-stream.h
--- a/clients/mapiclient/iconv-stream.h
+++ b/clients/mapiclient/iconv-stream.h
@@ -9,6 +9,7 @@
*/
#include <iconv.h>
+#include "stream.h"
struct ic_priv_t {
stream *s;
diff --git a/clients/mapiclient/mhelp.h b/clients/mapiclient/mhelp.h
--- a/clients/mapiclient/mhelp.h
+++ b/clients/mapiclient/mhelp.h
@@ -8,4 +8,6 @@
* For copyright information, see the file debian/copyright.
*/
+#include "stream.h"
+
extern void sql_help(const char *pattern, stream *toConsole, int pagewidth);
diff --git a/clients/mapiclient/msqldump.h b/clients/mapiclient/msqldump.h
--- a/clients/mapiclient/msqldump.h
+++ b/clients/mapiclient/msqldump.h
@@ -8,6 +8,9 @@
* For copyright information, see the file debian/copyright.
*/
+#include "mapi.h"
+#include "stream.h"
+
extern int describe_sequence(Mapi mid, const char *schema, const char *sname,
stream *toConsole);
extern int describe_schema(Mapi mid, const char *sname, stream *toConsole);
extern int dump_table(Mapi mid, const char *schema, const char *tname, stream
*sqlf, const char *ddir, const char *ext, bool describe, bool foreign, bool
useInserts, bool databaseDump, bool noescape, bool percent);
diff --git a/clients/mapilib/mapi.h b/clients/mapilib/mapi.h
--- a/clients/mapilib/mapi.h
+++ b/clients/mapilib/mapi.h
@@ -72,6 +72,10 @@ extern "C" {
#ifndef __attribute__
#define __attribute__(...)
#endif
+#else
+#if !__has_attribute(__nonnull__)
+#define __nonnull__(...)
+#endif
#endif
/* connection-oriented functions */
diff --git a/clients/mapilib/mapi_intern.h b/clients/mapilib/mapi_intern.h
--- a/clients/mapilib/mapi_intern.h
+++ b/clients/mapilib/mapi_intern.h
@@ -8,7 +8,7 @@
* For copyright information, see the file debian/copyright.
*/
-#include "msettings.h"
+#include "monetdb_config.h"
#ifdef HAVE_UNISTD_H
# include <unistd.h>
@@ -48,6 +48,8 @@
#include <openssl/ssl.h>
#endif
+#include "msettings.h"
+#include "stream.h"
/* Copied from gdk_posix, but without taking a lock because we don't have
access to
* MT_lock_set/unset here. We just have to hope for the best
diff --git a/clients/mapilib/msettings.h b/clients/mapilib/msettings.h
--- a/clients/mapilib/msettings.h
+++ b/clients/mapilib/msettings.h
@@ -12,6 +12,7 @@
#define _MSETTINGS_H 1
#include "mapi.h"
+#include <assert.h>
#include <stdbool.h>
#define MP__BOOL_START (100)
diff --git a/clients/mapilib/msettings_internal.h
b/clients/mapilib/msettings_internal.h
--- a/clients/mapilib/msettings_internal.h
+++ b/clients/mapilib/msettings_internal.h
@@ -11,6 +11,7 @@
#ifndef MSETTINGS_INTERNAL
#define MSETTINGS_INTERNAL
+#include "monetdb_config.h"
#include "msettings.h"
extern const char MALLOC_FAILED[];
@@ -138,9 +139,7 @@ msettings_strdup(const msettings *mp, co
}
-static inline char* msettings_allocprintf(const msettings *mp, _In_z_
_Printf_format_string_ const char *fmt, ...)
- __attribute__((__format__(__printf__, 2, 3)));
-
+__attribute__((__format__(__printf__, 2, 3)))
static inline char*
msettings_allocprintf(const msettings *mp, const char *fmt, ...)
{
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
