Browse Source

Fix compilation error if DEBUG is not set, use GDB_RAW_OUTPUT macro

git-svn-id: trunk@30094 -
pierre 10 years ago
parent
commit
fd33786c67
1 changed files with 14 additions and 14 deletions
  1. 14 14
      ide/gdbmiint.pas

+ 14 - 14
ide/gdbmiint.pas

@@ -62,9 +62,9 @@ type
   TGDBInterface = object
   TGDBInterface = object
   private
   private
     user_screen_shown: Boolean;
     user_screen_shown: Boolean;
-{$ifdef DEBUG}
+{$ifdef GDB_RAW_OUTPUT}
     output_raw : boolean;
     output_raw : boolean;
-{$endif DEBUG}
+{$endif GDB_RAW_OUTPUT}
   protected
   protected
     GDB: TGDBWrapper;
     GDB: TGDBWrapper;
 
 
@@ -74,9 +74,11 @@ type
   public
   public
     GDBErrorBuf: TGDBBuffer;
     GDBErrorBuf: TGDBBuffer;
     GDBOutputBuf: TGDBBuffer;
     GDBOutputBuf: TGDBBuffer;
-{$ifdef DEBUG}
+{$ifdef GDB_RAW_OUTPUT}
+    { Separate Raw buffer to display everything inside GDB Window
+      but without parsing it twice }
     GDBRawBuf: TGDBBuffer;
     GDBRawBuf: TGDBBuffer;
-{$endif DEBUG}
+{$endif GDB_RAW_OUTPUT}
     got_error: Boolean;
     got_error: Boolean;
     reset_command: Boolean;
     reset_command: Boolean;
     Debuggee_started: Boolean;
     Debuggee_started: Boolean;
@@ -239,12 +241,10 @@ begin
   command_level := 0;
   command_level := 0;
   Debuggee_started:=false;
   Debuggee_started:=false;
   init_count:=0;
   init_count:=0;
-{$ifdef DEBUG}
+{$ifdef GDB_RAW_OUTPUT}
   output_raw:=true;
   output_raw:=true;
   GDBRawBuf.Init;
   GDBRawBuf.Init;
-{$else}
-  output_raw:=false;
-{$endif}
+{$endif GDB_RAW_OUTPUT}
 { other standard commands used for fpc debugging }
 { other standard commands used for fpc debugging }
   i_gdb_command('-gdb-set print demangle off');
   i_gdb_command('-gdb-set print demangle off');
   i_gdb_command('-gdb-set gnutarget auto');
   i_gdb_command('-gdb-set gnutarget auto');
@@ -260,9 +260,9 @@ begin
   GDB.Free;
   GDB.Free;
   GDBErrorBuf.Done;
   GDBErrorBuf.Done;
   GDBOutputBuf.Done;
   GDBOutputBuf.Done;
-{$ifdef DEBUG}
+{$ifdef GDB_RAW_OUTPUT}
   GDBRawBuf.Done;
   GDBRawBuf.Done;
-{$endif DEBUG}
+{$endif GDB_RAW_OUTPUT}
 end;
 end;
 
 
 function TGDBInterface.GetOutput: PChar;
 function TGDBInterface.GetOutput: PChar;
@@ -270,12 +270,12 @@ begin
   GetOutput := GDBOutputBuf.buf;
   GetOutput := GDBOutputBuf.buf;
 end;
 end;
 
 
-{$ifdef DEBUG}
+{$ifdef GDB_RAW_OUTPUT}
 function TGDBInterface.GetRaw: PChar;
 function TGDBInterface.GetRaw: PChar;
 begin
 begin
   GetRaw := GDBRawBuf.buf;
   GetRaw := GDBRawBuf.buf;
 end;
 end;
-{$endif DEBUG}
+{$endif GDB_RAW_OUTPUT}
 
 
 function TGDBInterface.GetError: PChar;
 function TGDBInterface.GetError: PChar;
 var
 var
@@ -304,11 +304,11 @@ begin
   Inc(command_level);
   Inc(command_level);
   got_error := False;
   got_error := False;
   GDB.Command(S);
   GDB.Command(S);
-{$ifdef DEBUG}
+{$ifdef GDB_RAW_OUTPUT}
   if output_raw then
   if output_raw then
     for I := 0 to GDB.RawResponse.Count - 1 do
     for I := 0 to GDB.RawResponse.Count - 1 do
       GDBRawBuf.Append(PChar(GDB.RawResponse[I]));
       GDBRawBuf.Append(PChar(GDB.RawResponse[I]));
-{$endif DEBUG}
+{$endif GDB_RAW_OUTPUT}
 
 
   for I := 0 to GDB.ConsoleStream.Count - 1 do
   for I := 0 to GDB.ConsoleStream.Count - 1 do
     GDBOutputBuf.Append(PChar(GDB.ConsoleStream[I]));
     GDBOutputBuf.Append(PChar(GDB.ConsoleStream[I]));