diff options
| author | Steve Zesch <[email protected]> | 2012-11-20 20:57:16 -0800 |
|---|---|---|
| committer | Steve Zesch <[email protected]> | 2012-11-20 20:57:16 -0800 |
| commit | 3ba516419041962944da9f9bdf0cb55810a2ad02 (patch) | |
| tree | 620d5fa2f8be7c9a65313c6a238cc349e6faaad4 /src/core/main.c | |
| parent | d72b5f2a0bbd035a98979c3519de90a194f67e05 (diff) | |
| parent | 3c82397d3fdbbaa8d1614a6f5eeeaad4ef20d3f6 (diff) | |
| download | marco-3ba516419041962944da9f9bdf0cb55810a2ad02.tar.bz2 marco-3ba516419041962944da9f9bdf0cb55810a2ad02.tar.xz | |
Merge pull request #26 from sbalneav/master
Deprecations and warnings
Diffstat (limited to 'src/core/main.c')
| -rw-r--r-- | src/core/main.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/core/main.c b/src/core/main.c index 90332c50..5f8d9b32 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -69,6 +69,12 @@ #include <time.h> #include <unistd.h> +#ifdef __GNUC__ +#define UNUSED_VARIABLE __attribute__ ((unused)) +#else +#define UNUSED_VARIABLE +#endif + /** * The exit code we'll return to our parent process when we eventually die. */ @@ -376,7 +382,7 @@ sigterm_handler (int signum) { if (sigterm_pipe_fds[1] >= 0) { - int dummy; + int UNUSED_VARIABLE dummy; dummy = write (sigterm_pipe_fds[1], "", 1); close (sigterm_pipe_fds[1]); @@ -415,8 +421,12 @@ main (int argc, char **argv) guint i; GIOChannel *channel; +#if GLIB_CHECK_VERSION (2, 32, 0) + /* g_thread_init () deprecated */ +#else if (!g_thread_supported ()) g_thread_init (NULL); +#endif if (setlocale (LC_ALL, "") == NULL) meta_warning ("Locale not understood by C library, internationalization will not work\n"); |