Changeset: 17448cb60dcd for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=17448cb60dcd
Modified Files:
clients/mapiclient/mclient.c
clients/mapiclient/msqldump.c
configure.ag
gdk/gdk_private.h
gdk/gdk_system.h
testing/Mtimeout.c
testing/helpers.h
tools/merovingian/client/monetdb.c
tools/mserver/mserver5.c
Branch: Jan2014
Log Message:
Specify that certain functions don't return the Microsoft way.
diffs (113 lines):
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -2598,7 +2598,7 @@ set_timezone(Mapi mid)
mapi_close_handle(hdl);
}
-static void usage(const char *prog, int xit)
+__declspec(noreturn) static void usage(const char *prog, int xit)
__attribute__((__noreturn__));
static void
diff --git a/clients/mapiclient/msqldump.c b/clients/mapiclient/msqldump.c
--- a/clients/mapiclient/msqldump.c
+++ b/clients/mapiclient/msqldump.c
@@ -50,7 +50,7 @@
#include "msqldump.h"
#include "mprompt.h"
-static void usage(const char *prog, int xit)
+__declspec(noreturn) static void usage(const char *prog, int xit)
__attribute__((__noreturn__));
static void
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -3233,6 +3233,7 @@ typedef lng ptrdiff_t;
#if !defined(_MSC_VER) && !defined(_In_z_)
# define _In_z_
# define _Printf_format_string_
+# define __declspec(x)
#endif
#endif /* _SEEN_MONETDB_CONFIG_H */
diff --git a/gdk/gdk_private.h b/gdk/gdk_private.h
--- a/gdk/gdk_private.h
+++ b/gdk/gdk_private.h
@@ -135,7 +135,7 @@ int HEAPwarm(Heap *h)
__attribute__((__visibility__("hidden")));
oid MAXoid(BAT *i)
__attribute__((__visibility__("hidden")));
-void MT_global_exit(int status)
+__declspec(noreturn) void MT_global_exit(int status)
__attribute__((__noreturn__))
__attribute__((__visibility__("hidden")));
void MT_init_posix(void)
diff --git a/gdk/gdk_system.h b/gdk/gdk_system.h
--- a/gdk/gdk_system.h
+++ b/gdk/gdk_system.h
@@ -132,10 +132,10 @@ enum MT_thr_detach { MT_THR_JOINABLE, MT
gdk_export int MT_create_thread(MT_Id *t, void (*function) (void *),
void *arg, enum MT_thr_detach d);
-gdk_export void MT_exit_thread(int status)
+__declspec(noreturn) gdk_export void MT_exit_thread(int status)
__attribute__((__noreturn__));
gdk_export void MT_exiting_thread(void);
-gdk_export void MT_global_exit(int status)
+__declspec(noreturn) gdk_export void MT_global_exit(int status)
__attribute__((__noreturn__));
gdk_export MT_Id MT_getpid(void);
gdk_export int MT_join_thread(MT_Id t);
diff --git a/testing/Mtimeout.c b/testing/Mtimeout.c
--- a/testing/Mtimeout.c
+++ b/testing/Mtimeout.c
@@ -154,7 +154,7 @@ limit(char **argv)
}
-static void usage(void)
+__declspec(noreturn) static void usage(void)
__attribute__((__noreturn__));
static void
diff --git a/testing/helpers.h b/testing/helpers.h
--- a/testing/helpers.h
+++ b/testing/helpers.h
@@ -25,7 +25,7 @@
#define MAX(a,b) (((a)>(b))?(a):(b))
#define MIN(a,b) (((a)<(b))?(a):(b))
-void ErrXit(char *text1, char *text2, int num)
+__declspec(noreturn) void ErrXit(char *text1, char *text2, int num)
__attribute__((__noreturn__));
FILE *Rfopen(char *name);
FILE *Wfopen(char *name);
diff --git a/tools/merovingian/client/monetdb.c
b/tools/merovingian/client/monetdb.c
--- a/tools/merovingian/client/monetdb.c
+++ b/tools/merovingian/client/monetdb.c
@@ -1088,7 +1088,7 @@ typedef enum {
INHERIT
} meroset;
-static void command_set(int argc, char *argv[], meroset type)
+__declspec(noreturn) static void command_set(int argc, char *argv[], meroset
type)
__attribute__((__noreturn__));
static void
diff --git a/tools/mserver/mserver5.c b/tools/mserver/mserver5.c
--- a/tools/mserver/mserver5.c
+++ b/tools/mserver/mserver5.c
@@ -76,8 +76,8 @@ mserver_abort()
}
#endif
-static void usage(char *prog, int xit)
-__attribute__((__noreturn__));
+__declspec(noreturn) static void usage(char *prog, int xit)
+ __attribute__((__noreturn__));
static void
usage(char *prog, int xit)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
