Changeset: 3f6fb836eba7 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/3f6fb836eba7
Modified Files:
clients/mapilib/mapi_intern.h
gdk/gdk_system.h
monetdb5/mal/mal_exception.h
Branch: default
Log Message:
Minor updates to __attribute__ use.
diffs (64 lines):
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
@@ -273,7 +273,7 @@ extern char mapi_nomem[];
void mapi_clrError(Mapi mid)
__attribute__((__nonnull__(1)));
MapiMsg mapi_setError(Mapi mid, const char *msg, const char *action, MapiMsg
error)
- __attribute__((__nonnull__(2))) __attribute__((__nonnull__(3)));
+ __attribute__((__nonnull__(2, 3)));
MapiMsg mapi_printError(Mapi mid, const char *action, MapiMsg error, const
char *fmt, ...)
__attribute__((__nonnull__(2))) __attribute__((__format__(__printf__,
4, 5)));
diff --git a/gdk/gdk_system.h b/gdk/gdk_system.h
--- a/gdk/gdk_system.h
+++ b/gdk/gdk_system.h
@@ -43,7 +43,7 @@
#endif
#endif
#if !__has_attribute(__alloc_size__)
-#define __alloc_size__(a)
+#define __alloc_size__(...)
#endif
#if !__has_attribute(__cold__)
#define __cold__
@@ -58,13 +58,13 @@
#define __designated_init__
#endif
#if !__has_attribute(__format__)
-#define __format__(a,b,c)
+#define __format__(...)
#endif
#if !__has_attribute(__malloc__)
#define __malloc__
#endif
#if !__has_attribute(__nonnull__)
-#define __nonnull__(a)
+#define __nonnull__(...)
#endif
#if !__has_attribute(__nonstring__)
#define __nonstring__
@@ -76,9 +76,9 @@
#define __returns_nonnull__
#endif
#if !__has_attribute(__visibility__)
-#define __visibility__(a)
+#define __visibility__(...)
#elif defined(__CYGWIN__)
-#define __visibility__(a)
+#define __visibility__(...)
#endif
#if !__has_attribute(__warn_unused_result__)
#define __warn_unused_result__
diff --git a/monetdb5/mal/mal_exception.h b/monetdb5/mal/mal_exception.h
--- a/monetdb5/mal/mal_exception.h
+++ b/monetdb5/mal/mal_exception.h
@@ -56,7 +56,7 @@ mal_export str createMalException(MalBlk
__attribute__((__format__(__printf__, 4, 5)))
__attribute__((__returns_nonnull__));
mal_export char *concatErrors(char *err1, const char *err2)
- __attribute__((__nonnull__(1))) __attribute__((__nonnull__(2)))
+ __attribute__((__nonnull__(1, 2)))
__attribute__((__returns_nonnull__));
mal_export bool isExceptionVariable(const char *nme);
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
