From 5801b5518fd89f8b84cd9e0930b1651a0e9ca5ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Thu, 24 Sep 2015 01:18:15 +0200
Subject: [PATCH] Annotate functions to improve compiler diagnostics

---
 src/core/util.c            | 2 +-
 src/meta/main.h            | 2 +-
 src/wayland/meta-wayland.c | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/core/util.c b/src/core/util.c
index 71ff68dea..f4e56b964 100644
--- a/src/core/util.c
+++ b/src/core/util.c
@@ -46,7 +46,7 @@
 static void
 meta_topic_real_valist (MetaDebugTopic topic,
                         const char    *format,
-                        va_list        args);
+                        va_list        args) G_GNUC_PRINTF(2, 0);
 #endif
 
 static gint verbose_topics = 0;
diff --git a/src/meta/main.h b/src/meta/main.h
index d79ddcccc..1cc8ff0a7 100644
--- a/src/meta/main.h
+++ b/src/meta/main.h
@@ -49,7 +49,7 @@ typedef enum
 } MetaExitCode;
 
 /* exit immediately */
-void meta_exit (MetaExitCode code);
+void meta_exit (MetaExitCode code) G_GNUC_NORETURN;
 
 /* g_main_loop_quit() then fall out of main() */
 void meta_quit (MetaExitCode code);
diff --git a/src/wayland/meta-wayland.c b/src/wayland/meta-wayland.c
index 65e05f629..ee5875198 100644
--- a/src/wayland/meta-wayland.c
+++ b/src/wayland/meta-wayland.c
@@ -272,6 +272,8 @@ set_gnome_env (const char *name,
     }
 }
 
+static void meta_wayland_log_func (const char *, va_list) G_GNUC_PRINTF (1, 0);
+
 static void
 meta_wayland_log_func (const char *fmt,
                        va_list     arg)