Просмотр исходного кода

Merge branch source:main into main

Curtis Hamilton 2 недель назад
Родитель
Сommit
4e2abfa524

+ 1 - 1
packages/libtar/src/libtar.pp

@@ -237,7 +237,7 @@ TYPE
 
 // --- Some useful constants
 CONST
-  FILETYPE_NAME : ARRAY [TFileType] OF STRING =
+  FILETYPE_NAME : ARRAY [TFileType] OF STRING[14] =
                   ('Regular', 'Link', 'Symbolic Link', 'AnsiChar File', 'Block File',
                    'Directory', 'FIFO File', 'Contiguous', 'Dir Dump', 'Multivol', 'Volume Header');
 

+ 2 - 0
tests/test/packages/fcl-image/timage_jpegorientation.pp

@@ -1,3 +1,5 @@
+{ Use fpcres instead of default windres utility }
+{ %OPT=-FF }
 program timage_jpegorientation;
 
 {$mode objfpc}{$H+}