* tp7 didn't like my ifopt H+ :(

compiler/comphook.pas

@@ -111,11 +111,15 @@ begin
       gccfilename[i]:=s[i];
      end;
    end;
-{$ifopt H+}
-  setlength(gccfilename,length(s));
-{$else}
-  gccfilename[0]:=s[0];
-{$endif}
+  {$ifndef TP}
+    {$ifopt H+}
+      setlength(gccfilename,length(s));
+    {$else}
+      gccfilename[0]:=s[0];
+    {$endif}
+  {$else}
+    gccfilename[0]:=s[0];
+  {$endif}
 end;
 
 
@@ -258,7 +262,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.11  1998-11-16 12:17:59  peter
+  Revision 1.12  1998-11-16 15:41:39  peter
+    * tp7 didn't like my ifopt H+ :(
+
+  Revision 1.11  1998/11/16 12:17:59  peter
     * H+ fixes
 
   Revision 1.10  1998/10/27 13:45:25  pierre

compiler/files.pas

@@ -478,11 +478,15 @@ unit files;
              getlinestr[i]:=c;
              inc(longint(p));
            until (i=255);
-{$ifopt H+}
-           setlength(getlinestr,i);
-{$else}
-           getlinestr[0]:=chr(i);
-{$endif}
+           {$ifndef TP}
+             {$ifopt H+}
+               setlength(getlinestr,i);
+             {$else}
+               getlinestr[0]:=chr(i);
+             {$endif}
+           {$else}
+             getlinestr[0]:=chr(i);
+           {$endif}
          end;
       end;
 
@@ -1046,7 +1050,10 @@ unit files;
 end.
 {
   $Log$
-  Revision 1.74  1998-11-16 12:18:01  peter
+  Revision 1.75  1998-11-16 15:41:40  peter
+    * tp7 didn't like my ifopt H+ :(
+
+  Revision 1.74  1998/11/16 12:18:01  peter
     * H+ fixes
 
   Revision 1.73  1998/11/16 11:28:58  pierre

compiler/ppu.pas

@@ -575,11 +575,15 @@ function tppufile.getstring:string;
 var
   s : string;
 begin
-{$ifopt H+}
-  setlength(s,getbyte);
-{$else}
-  s[0]:=chr(getbyte);
-{$endif}
+  {$ifndef TP}
+    {$ifopt H+}
+      setlength(s,getbyte);
+    {$else}
+      s[0]:=chr(getbyte);
+    {$endif}
+  {$else}
+    s[0]:=chr(getbyte);
+  {$endif}
   if entryidx+length(s)>entry.size then
    begin
      error:=true;
@@ -780,7 +784,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.18  1998-11-16 12:18:03  peter
+  Revision 1.19  1998-11-16 15:41:42  peter
+    * tp7 didn't like my ifopt H+ :(
+
+  Revision 1.18  1998/11/16 12:18:03  peter
     * H+ fixes
 
   Revision 1.17  1998/10/14 10:45:08  pierre

compiler/scandir.inc

@@ -140,11 +140,15 @@ const
                                end
                              else
                                len:=mac^.buflen;
-{$ifopt H+}
-                             setlength(hs,len);
-{$else}
-                             hs[0]:=char(len);
-{$endif}
+                             {$ifndef TP}
+                               {$ifopt H+}
+                                 setlength(hs,len);
+                               {$else}
+                                 hs[0]:=char(len);
+                               {$endif}
+                             {$else}
+                               hs[0]:=char(len);
+                             {$endif}
                              move(mac^.buftext^,hs[1],len);
                           end
                         else
@@ -520,11 +524,7 @@ const
         i:=length(hs);
         while (i>0) and (hs[i]=' ') do
          dec(i);
-{$ifopt H+}
-        setlength(hs,i);
-{$else}
-        hs[0]:=chr(i);
-{$endif}
+        Delete(hs,i+1,length(hs)-i);
         if hs='' then
          exit;
         if (hs[1]='%') then
@@ -985,7 +985,10 @@ const
 
 {
   $Log$
-  Revision 1.42  1998-11-16 12:18:04  peter
+  Revision 1.43  1998-11-16 15:41:43  peter
+    * tp7 didn't like my ifopt H+ :(
+
+  Revision 1.42  1998/11/16 12:18:04  peter
     * H+ fixes
 
   Revision 1.41  1998/10/22 17:54:08  florian

compiler/scanner.pas

@@ -647,13 +647,18 @@ implementation
            break;
           end;
         until false;
-{$ifopt H+}
-        setlength(orgpattern,i);
-        setlength(pattern,i);
-{$else}
-        orgpattern[0]:=chr(i);
-        pattern[0]:=chr(i);
-{$endif}
+        {$ifndef TP}
+          {$ifopt H+}
+            setlength(orgpattern,i);
+            setlength(pattern,i);
+          {$else}
+            orgpattern[0]:=chr(i);
+            pattern[0]:=chr(i);
+          {$endif}
+        {$else}
+          orgpattern[0]:=chr(i);
+          pattern[0]:=chr(i);
+        {$endif}
       end;
 
 
@@ -700,11 +705,15 @@ implementation
       { was the next char a linebreak ? }
         if c in [#10,#13] then
          linebreak;
-{$ifopt H+}
-        setlength(pattern,i);
-{$else}
-        pattern[0]:=chr(i);
-{$endif}
+        {$ifndef TP}
+          {$ifopt H+}
+            setlength(pattern,i);
+          {$else}
+            pattern[0]:=chr(i);
+          {$endif}
+        {$else}
+          pattern[0]:=chr(i);
+        {$endif}
       end;
 
 
@@ -756,11 +765,15 @@ implementation
           if c in [#10,#13] then
            linebreak;
         until false;
-{$ifopt H+}
-        setlength(readcomment,i);
-{$else}
-        readcomment[0]:=chr(i);
-{$endif}
+        {$ifndef TP}
+          {$ifopt H+}
+            setlength(readcomment,i);
+          {$else}
+            readcomment[0]:=chr(i);
+          {$endif}
+        {$else}
+          readcomment[0]:=chr(i);
+        {$endif}
       end;
 
 
@@ -1535,7 +1548,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.67  1998-11-16 12:18:06  peter
+  Revision 1.68  1998-11-16 15:41:44  peter
+    * tp7 didn't like my ifopt H+ :(
+
+  Revision 1.67  1998/11/16 12:18:06  peter
     * H+ fixes
 
   Revision 1.66  1998/11/05 23:48:29  peter

compiler/systems.pas

@@ -914,8 +914,12 @@ begin
     upper[i]:=char(byte(s[i])-32)
    else
     upper[i]:=s[i];
-{$ifopt H+}
-  SetLength(upper,length(s));
+{$ifndef TP}
+  {$ifopt H+}
+    SetLength(upper,length(s));
+  {$else}
+    upper[0]:=s[0];
+  {$endif}
 {$else}
   upper[0]:=s[0];
 {$endif}
@@ -1178,7 +1182,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.49  1998-11-16 10:17:09  peter
+  Revision 1.50  1998-11-16 15:41:45  peter
+    * tp7 didn't like my ifopt H+ :(
+
+  Revision 1.49  1998/11/16 10:17:09  peter
     * fixed for H+ compilation
 
   Revision 1.48  1998/10/26 14:19:30  pierre