Fix bug #2982 'variable declaration behind FLOCK conditional'
authorRicardo Mones <ricardo@mones.org>
Thu, 25 Jul 2013 11:10:15 +0000 (13:10 +0200)
committerRicardo Mones <ricardo@mones.org>
Thu, 25 Jul 2013 11:10:15 +0000 (13:10 +0200)
Patch by Richard Palo <richard@NetBSD.org>, added to AUTHORS.
Also synchronize authors.h with AUTHORS while we're at it.

AUTHORS
src/gtk/authors.h
src/main.c

diff --git a/AUTHORS b/AUTHORS
index 27c6f8a..0c4e1b6 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -297,3 +297,4 @@ contributors (in addition to the above; based on Changelog)
        Ben Deering
        Henri Bauer
        Michal Gorny
+       Richard Palo
index 7d2d2bd..209a426 100644 (file)
@@ -283,5 +283,7 @@ static char *CONTRIBS_LIST[] = {
 "Gál Zoltán",
 "Marien Zwart",
 "Martin Zwickel",
+"Michal Gorny",
+"Richard Palo",
 NULL
 };
index 131c807..f7a2eaa 100644 (file)
@@ -2190,10 +2190,10 @@ static gint prohibit_duplicate_launch(void)
                x_display = g_strdup(g_getenv("DISPLAY"));
 
        if (uxsock < 0) {
+               gint ret;
 #if HAVE_FLOCK
                gchar *socket_lock;
                gint lock_fd;
-               gint ret;
                /* If connect failed, no other process is running.
                 * Unlink the potentially existing socket, then
                 * open it. This has to be done locking a temporary