From 47c6215c223ac85eeb31504aa2a56369bdfb3789 Mon Sep 17 00:00:00 2001
From: "Wladimir J. van der Laan" <laanwj@gmail.com>
Date: Wed, 22 Jun 2011 20:11:12 +0200
Subject: use #ifdef QT_UI to distinguish Qt UI instead of hardcoded #if 0

---
 src/init.cpp | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

(limited to 'src/init.cpp')

diff --git a/src/init.cpp b/src/init.cpp
index f30618531..cbd9fc021 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -75,8 +75,7 @@ void HandleSIGTERM(int)
 //
 // Start
 //
-#if 0
-#ifndef GUI
+#if !defined(QT_GUI) && !defined(GUI)
 int main(int argc, char* argv[])
 {
     bool fRet = false;
@@ -88,7 +87,6 @@ int main(int argc, char* argv[])
     return 1;
 }
 #endif
-#endif
 
 bool AppInit(int argc, char* argv[])
 {
@@ -228,10 +226,8 @@ bool AppInit2(int argc, char* argv[])
         fServer = GetBoolArg("-server");
 
     /* force fServer when running without GUI */
-#if 0
-#ifndef GUI
+#if !defined(QT_GUI) && !defined(GUI)
     fServer = true;
-#endif
 #endif
     fPrintToConsole = GetBoolArg("-printtoconsole");
     fPrintToDebugger = GetBoolArg("-printtodebugger");
@@ -529,11 +525,9 @@ bool AppInit2(int argc, char* argv[])
         SetStartOnSystemStartup(true);
 #endif
 
-#if 0
-#ifndef GUI
+#if !defined(QT_GUI) && !defined(GUI)
     while (1)
         Sleep(5000);
-#endif
 #endif
 
     return true;
-- 
cgit v1.2.3