From 97012c377f1bee34a82a87836803e50301cc821e Mon Sep 17 00:00:00 2001
From: michael <michael@freepascal.org>
Date: Wed, 25 May 2011 19:42:50 +0000
Subject: [PATCH] * Removed debug define, removed stray flush() statement

git-svn-id: trunk@17557 -
---
 packages/fcl-extra/src/daemonapp.pp      | 19 +++++++++++--------
 packages/fcl-extra/src/win/daemonapp.inc |  1 -
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/packages/fcl-extra/src/daemonapp.pp b/packages/fcl-extra/src/daemonapp.pp
index 65cf4eba8c..51250a2609 100644
--- a/packages/fcl-extra/src/daemonapp.pp
+++ b/packages/fcl-extra/src/daemonapp.pp
@@ -19,14 +19,14 @@ interface
 
 uses
   Custapp, Classes, SysUtils, eventlog, rtlconsts;
-  
+
 Type
   TCustomDaemon = Class;
   TDaemonController = Class;
 
   TDaemonEvent = procedure(Sender: TCustomDaemon) of object;
   TDaemonOKEvent = procedure(Sender: TCustomDaemon; var OK: Boolean) of object;
-  
+
   TDaemonOption = (doAllowStop,doAllowPause,doInteractive);
   TDaemonOptions = Set of TDaemonOption;
 
@@ -412,7 +412,7 @@ Resourcestring
   SHelpUnInstall                = 'To uninstall the service';
   SHelpRun                      = 'To run the service';
 
-{$define svcdebug}
+{ $define svcdebug}
 
 {$ifdef svcdebug}
 Procedure DebugLog(Msg : String);
@@ -852,11 +852,14 @@ end;
 
 procedure TCustomDaemonApplication.ShowHelp;
 begin
-  writeln(Format(SHelpUsage,[ParamStr(0)]));
-  writeln(SHelpCommand);
-  writeln('  -i --install   '+SHelpInstall);
-  writeln('  -u --uninstall '+SHelpUnInstall);
-  writeln('  -r --run       '+SHelpRun);
+  if IsConsole then
+    begin
+    writeln(Format(SHelpUsage,[ParamStr(0)]));
+    writeln(SHelpCommand);
+    writeln('  -i --install   '+SHelpInstall);
+    writeln('  -u --uninstall '+SHelpUnInstall);
+    writeln('  -r --run       '+SHelpRun);
+	end
 end;
 
 procedure TCustomDaemonApplication.CreateForm(InstanceClass: TComponentClass;
diff --git a/packages/fcl-extra/src/win/daemonapp.inc b/packages/fcl-extra/src/win/daemonapp.inc
index 35d4874a6c..37618bb62b 100644
--- a/packages/fcl-extra/src/win/daemonapp.inc
+++ b/packages/fcl-extra/src/win/daemonapp.inc
@@ -237,7 +237,6 @@ begin
     PDeps:=GetDependencies(Dependencies);
     end;
   Try
-    flush(output);
     SV:=CreateService(SM, PChar(N), PChar(DN), SERVICE_ALL_ACCESS, ST, STT, ES,
                       PChar(E), PChar(LG), PIDTag, PDeps, PN, PP);
     If (SV=0) then