Browse Source

* userdata in file/textrecs now 32 bytes

florian 20 years ago
parent
commit
534b11cfb1
4 changed files with 29 additions and 8 deletions
  1. 5 1
      compiler/options.pas
  2. 8 5
      compiler/symdef.pas
  3. 8 1
      rtl/inc/filerec.inc
  4. 8 1
      rtl/inc/textrec.inc

+ 5 - 1
compiler/options.pas

@@ -1737,6 +1737,7 @@ begin
   def_system_macro('FPC_LINEEND_IN_TEXTREC');
   def_system_macro('FPC_LINEEND_IN_TEXTREC');
   def_system_macro('FPC_ALIGNSRTTI');
   def_system_macro('FPC_ALIGNSRTTI');
   def_system_macro('FPC_HASNOFARPOINTER');
   def_system_macro('FPC_HASNOFARPOINTER');
+  def_system_macro('FPC_HASUSERDATA32');
 {$ifdef i386}
 {$ifdef i386}
   def_system_macro('HASINTF');
   def_system_macro('HASINTF');
   def_system_macro('HASVARIANT');
   def_system_macro('HASVARIANT');
@@ -2100,7 +2101,10 @@ finalization
 end.
 end.
 {
 {
   $Log$
   $Log$
-  Revision 1.167  2005-02-19 18:32:16  florian
+  Revision 1.168  2005-02-26 15:43:09  florian
+    * userdata in file/textrecs now 32 bytes
+
+  Revision 1.167  2005/02/19 18:32:16  florian
     * defaultreplacement expansion for -XP and -Xr
     * defaultreplacement expansion for -XP and -Xr
 
 
   Revision 1.166  2005/02/19 18:10:57  florian
   Revision 1.166  2005/02/19 18:10:57  florian

+ 8 - 5
compiler/symdef.pas

@@ -2320,18 +2320,18 @@ implementation
 {$ifdef cpu64bit}
 {$ifdef cpu64bit}
         case filetyp of
         case filetyp of
           ft_text :
           ft_text :
-            savesize:=612;
+            savesize:=628;
           ft_typed,
           ft_typed,
           ft_untyped :
           ft_untyped :
-            savesize:=352;
+            savesize:=368;
         end;
         end;
 {$else cpu64bit}
 {$else cpu64bit}
         case filetyp of
         case filetyp of
           ft_text :
           ft_text :
-            savesize:=576;
+            savesize:=592;
           ft_typed,
           ft_typed,
           ft_untyped :
           ft_untyped :
-            savesize:=316;
+            savesize:=332;
         end;
         end;
 {$endif cpu64bit}
 {$endif cpu64bit}
       end;
       end;
@@ -6394,7 +6394,10 @@ implementation
 end.
 end.
 {
 {
   $Log$
   $Log$
-  Revision 1.297  2005-02-14 17:13:07  peter
+  Revision 1.298  2005-02-26 15:43:09  florian
+    * userdata in file/textrecs now 32 bytes
+
+  Revision 1.297  2005/02/14 17:13:07  peter
     * truncate log
     * truncate log
 
 
   Revision 1.296  2005/02/13 18:55:19  florian
   Revision 1.296  2005/02/13 18:55:19  florian

+ 8 - 1
rtl/inc/filerec.inc

@@ -29,13 +29,20 @@ type
     Mode      : longint;
     Mode      : longint;
     RecSize   : SizeInt;
     RecSize   : SizeInt;
     _private  : array[1..3 * SizeOf(SizeInt) + 5 * SizeOf (pointer)] of byte;
     _private  : array[1..3 * SizeOf(SizeInt) + 5 * SizeOf (pointer)] of byte;
+{$ifndef FPC_HASUSERDATA32}    
     UserData  : array[1..16] of byte;
     UserData  : array[1..16] of byte;
+{$else FPC_HASUSERDATA32}    
+    UserData  : array[1..32] of byte;
+{$endif FPC_HASUSERDATA32}
     name      : array[0..filerecnamelength] of char;
     name      : array[0..filerecnamelength] of char;
   End;
   End;
 
 
 {
 {
   $Log$
   $Log$
-  Revision 1.7  2005-02-14 17:13:22  peter
+  Revision 1.8  2005-02-26 15:42:45  florian
+    * userdata in file/textrecs now 32 bytes
+
+  Revision 1.7  2005/02/14 17:13:22  peter
     * truncate log
     * truncate log
 
 
 }
 }

+ 8 - 1
rtl/inc/textrec.inc

@@ -43,7 +43,11 @@ type
     inoutfunc,
     inoutfunc,
     flushfunc,
     flushfunc,
     closefunc : pointer;
     closefunc : pointer;
+{$ifndef FPC_HASUSERDATA32}    
     UserData  : array[1..16] of byte;
     UserData  : array[1..16] of byte;
+{$else FPC_HASUSERDATA32}    
+    UserData  : array[1..32] of byte;
+{$endif FPC_HASUSERDATA32}
     name      : array[0..textrecnamelength-1] of char;
     name      : array[0..textrecnamelength-1] of char;
 {$IFDEF FPC_LINEEND_IN_TEXTREC}
 {$IFDEF FPC_LINEEND_IN_TEXTREC}
     LineEnd   : TLineEndStr;
     LineEnd   : TLineEndStr;
@@ -53,7 +57,10 @@ type
 
 
 {
 {
   $Log$
   $Log$
-  Revision 1.8  2005-02-14 17:13:29  peter
+  Revision 1.9  2005-02-26 15:42:45  florian
+    * userdata in file/textrecs now 32 bytes
+
+  Revision 1.8  2005/02/14 17:13:29  peter
     * truncate log
     * truncate log
 
 
 }
 }