* patch by Alexander Shishkin to clean up $ifopt usage by $push/$pop, resolves #20346

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@19256 3ad0048d-3df7-0310-abae-a5850022a9f2

2 files changed, 4 insertions, 13 deletions

diff --git a/packages/graph/src/go32v2/vesa.inc b/packages/graph/src/go32v2/vesa.inc
index cac0dce64b..af7d3caf48 100644
--- a/packages/graph/src/go32v2/vesa.inc
+++ b/packages/graph/src/go32v2/vesa.inc
@@ -1094,15 +1094,10 @@ end;
        begin
          if TmpFillPattern and j <> 0 then
            fill.pat[7-i] := currentColor;
-{$ifopt q+}
+{$push}
 {$q-}
-{$define overflowOn}
-{$endif}
          j := j shl 1;
-{$ifdef overflowOn}
-{$q+}
-{$undef overflowOn}
-{$endif}
+{$pop}
        end;
      Repeat
        SetWriteBank(smallint(offs shr 16));
diff --git a/packages/graph/src/inc/gtext.inc b/packages/graph/src/inc/gtext.inc
index 25ae512ca8..dbcacecce6 100644
--- a/packages/graph/src/inc/gtext.inc
+++ b/packages/graph/src/inc/gtext.inc
@@ -785,14 +785,10 @@ end;
          if (font>DefaultFont) and not assigned(fonts[font].instr) then
            begin
               assign(f,bgipath+fonts[font].name+'.CHR');
-{$ifopt I+}
-{$define IOCHECK_WAS_ON}
+{$push}
 {$i-}
-{$endif}
               reset(f,1);
-{$ifdef IOCHECK_WAS_ON}
-{$i+}
-{$endif}
+{$pop}
               if ioresult<>0 then
                 begin
                    _graphresult:=grFontNotFound;