aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Jansen <mithi@mithi.net>2008-12-02 02:42:19 +0100
committerThomas Jansen <mithi@mithi.net>2008-12-02 02:42:19 +0100
commite6ae40982e89053a4326058e726422ef7602bd1a (patch)
tree537da7d160e6946803479e383f67b36388c7e53b
parentc252143d5147e541a42bf7bb2530e12c62962576 (diff)
downloadmpd-e6ae40982e89053a4326058e726422ef7602bd1a.tar.gz
mpd-e6ae40982e89053a4326058e726422ef7602bd1a.tar.xz
mpd-e6ae40982e89053a4326058e726422ef7602bd1a.zip
replaced mpd_noreturn by G_GNUC_NORETURN
We want to remove gcc.h eventually. This takes care of all the G_GNUC_NORETURN macros.
-rw-r--r--src/log.c2
-rw-r--r--src/log.h3
-rw-r--r--src/state_file.c2
-rw-r--r--src/state_file.h4
4 files changed, 6 insertions, 5 deletions
diff --git a/src/log.c b/src/log.c
index 4681a4a3b..e30511397 100644
--- a/src/log.c
+++ b/src/log.c
@@ -182,7 +182,7 @@ log_func(DEBUG, G_LOG_LEVEL_DEBUG)
#undef log_func
-mpd_printf mpd_noreturn void FATAL(const char *fmt, ...)
+mpd_printf G_GNUC_NORETURN void FATAL(const char *fmt, ...)
{
va_list args;
va_start(args, fmt);
diff --git a/src/log.h b/src/log.h
index 23e6d30be..436d54d97 100644
--- a/src/log.h
+++ b/src/log.h
@@ -21,6 +21,7 @@
#include "gcc.h"
+#include <glib.h>
#include <stdbool.h>
mpd_printf void ERROR(const char *fmt, ...);
@@ -28,7 +29,7 @@ mpd_printf void LOG(const char *fmt, ...);
mpd_printf void SECURE(const char *fmt, ...);
mpd_printf void DEBUG(const char *fmt, ...);
mpd_printf void WARNING(const char *fmt, ...);
-mpd_printf mpd_noreturn void FATAL(const char *fmt, ...);
+mpd_printf G_GNUC_NORETURN void FATAL(const char *fmt, ...);
void initLog(bool verbose);
diff --git a/src/state_file.c b/src/state_file.c
index 618d9b2f7..1a3e05a77 100644
--- a/src/state_file.c
+++ b/src/state_file.c
@@ -99,7 +99,7 @@ void read_state_file(void)
while(fclose(fp) && errno == EINTR) /* nothing */;
}
-void mpd_noreturn state_file_fatal(void)
+void G_GNUC_NORETURN state_file_fatal(void)
{
FATAL("error parsing state file \"%s\"\n", sfpath);
}
diff --git a/src/state_file.h b/src/state_file.h
index d92392437..0fa1793d5 100644
--- a/src/state_file.h
+++ b/src/state_file.h
@@ -19,10 +19,10 @@
#ifndef MPD_STATE_FILE_H
#define MPD_STATE_FILE_H
-#include "gcc.h"
+#include <glib.h>
void write_state_file(void);
void read_state_file(void);
-void mpd_noreturn state_file_fatal(void);
+void G_GNUC_NORETURN state_file_fatal(void);
#endif /* STATE_FILE_H */