[X2Go-Commits] [nx-libs] 10/19: Loop.cpp: drop ugly ifdef indentation

git-admin at x2go.org git-admin at x2go.org
Sat Dec 30 03:35:16 CET 2017


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.6.x
in repository nx-libs.

commit 2367fc714843fa0c19778e5a8e100c5f116255ee
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Wed Dec 27 14:43:50 2017 +0100

    Loop.cpp: drop ugly ifdef indentation
---
 nxcomp/src/Loop.cpp | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/nxcomp/src/Loop.cpp b/nxcomp/src/Loop.cpp
index 1bf3a61..d094bb7 100644
--- a/nxcomp/src/Loop.cpp
+++ b/nxcomp/src/Loop.cpp
@@ -3962,13 +3962,14 @@ void SetupDisplaySocket(int &addr_family, sockaddr *&addr,
         delete [] display;
         return;
 
-    } else {
+    }
 
-        cerr << "Info" << ": Falling back to file system X11 socket "
-             << "for accessing DISPLAY=:" << xPort << ".\n";
+    cerr << "Info" << ": Falling back to file system X11 socket "
+         << "for accessing DISPLAY=:" << xPort << ".\n";
 
-        delete xServerAddrABSTRACT;
-    #endif
+    delete xServerAddrABSTRACT;
+
+#endif
 
     struct stat statInfo;
 
@@ -4039,10 +4040,6 @@ void SetupDisplaySocket(int &addr_family, sockaddr *&addr,
     addr = (sockaddr *) xServerAddrUNIX;
     addr_length = sizeof(sockaddr_un);
 
-    #ifdef __linux__
-
-    }
-    #endif
   }
   else
   {

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git


More information about the x2go-commits mailing list