From ac00c6bc2dfe89d61b52c988e38c8765c698ef59 Mon Sep 17 00:00:00 2001 From: Corey Farrell Date: Sat, 21 Feb 2015 02:51:35 +0000 Subject: [PATCH] main/asterisk.c: Reverse #if statement in listener() to fix code folding. listener() opens the same code block in two places (#if and #else). This confuses some folding editors causing it to think that an extra code block was opened. Folding in 'geany' causes all code after listener() to be folded as if it were part of that procedure. ASTERISK-24813 #close Change-Id: I4b8c766e6c91e327dd445e8c18f8a6f268acd961 --- main/asterisk.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/main/asterisk.c b/main/asterisk.c index d99aaed189..0cecc51f76 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -1608,15 +1608,14 @@ static void *listener(void *unused) if (errno != EINTR) ast_log(LOG_WARNING, "Accept returned %d: %s\n", s, strerror(errno)); } else { -#if !defined(SO_PASSCRED) - { -#else +#if defined(SO_PASSCRED) int sckopt = 1; /* turn on socket credentials passing. */ if (setsockopt(s, SOL_SOCKET, SO_PASSCRED, &sckopt, sizeof(sckopt)) < 0) { ast_log(LOG_WARNING, "Unable to turn on socket credentials passing\n"); - } else { + } else #endif + { for (x = 0; x < AST_MAX_CONNECTS; x++) { if (consoles[x].fd >= 0) { continue; -- 2.47.2