Fix bug #2982 'variable declaration behind FLOCK conditional'

Patch by Richard Palo <richard@NetBSD.org>, added to AUTHORS.
Also synchronize authors.h with AUTHORS while we're at it.

diff --git a/AUTHORS b/AUTHORS
index 27c6f8ae1e2add2542754e6b0931ad0274173024..0c4e1b6c5678f94f6a5de37b7ce57ca310e3cab0 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
        Ben Deering
        Henri Bauer
        Michal Gorny

+       Richard Palo

diff --git a/src/gtk/authors.h b/src/gtk/authors.h
index 7d2d2bda3374582440b7f2b477b71e802b02dc82..209a426b7f99fa5c84a470df04668ab29edce2a7 100644 (file)
--- a/src/gtk/authors.h
+++ b/src/gtk/authors.h
@@ -283,5 +283,7 @@ static char *CONTRIBS_LIST[] = {
 "Gál Zoltán",
 "Marien Zwart",
 "Martin Zwickel",
 "Gál Zoltán",
 "Marien Zwart",
 "Martin Zwickel",

+"Michal Gorny",
+"Richard Palo",

 NULL
 };
 NULL
 };

diff --git a/src/main.c b/src/main.c
index 131c807f65d10d5554686b928912584bad6dc2fc..f7a2eaad2094e282842c667cf71ba8e36e1d9130 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -2190,10 +2190,10 @@ static gint prohibit_duplicate_launch(void)
                x_display = g_strdup(g_getenv("DISPLAY"));
 
        if (uxsock < 0) {
                x_display = g_strdup(g_getenv("DISPLAY"));
 
        if (uxsock < 0) {

+               gint ret;

 #if HAVE_FLOCK
                gchar *socket_lock;
                gint lock_fd;
 #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
                /* If connect failed, no other process is running.
                 * Unlink the potentially existing socket, then
                 * open it. This has to be done locking a temporary