Przeglądaj źródła

* moves the alias "TTime = time_t" from ptypes.inc to unixtype.pp.
This means it is not aliased in the body of the system unit (which causes
trouble with the delphi type of the same name), but baseunix/unix/unixtype
will containue to export the type.

git-svn-id: trunk@14584 -

marco 15 lat temu
rodzic
commit
5d87461507

+ 3 - 2
rtl/beos/ptypes.inc

@@ -85,8 +85,9 @@ type
     TClock   = clock_t;
     TClock   = clock_t;
     pClock   = ^clock_t;
     pClock   = ^clock_t;
 
 
-    time_t   = clong;           { used for returning the time  }
-    TTime    = time_t; 
+    time_t   = clong;           { used for returning the time  }/
+
+    // TTime    = time_t;    // Not allowed in system unit, -> unixtype
     pTime    = ^time_t;
     pTime    = ^time_t;
     ptime_t =  ^time_t;
     ptime_t =  ^time_t;
     
     

+ 2 - 1
rtl/darwin/ptypes.inc

@@ -77,7 +77,8 @@ type
     pClock   = ^clock_t;
     pClock   = ^clock_t;
 
 
     time_t   = clong;           { used for returning the time  }
     time_t   = clong;           { used for returning the time  }
-    TTime    = time_t;
+    // TTime    = time_t;    // Not allowed in system unit, -> unixtype
+
     pTime    = ^time_t;
     pTime    = ^time_t;
     ptime_t  = ^time_t;
     ptime_t  = ^time_t;
 
 

+ 3 - 1
rtl/freebsd/ptypes.inc

@@ -94,7 +94,9 @@ type
 
 
     time_t   = clong;           { used for returning the time, clong
     time_t   = clong;           { used for returning the time, clong
                                         is 64-bit on AMD64}
                                         is 64-bit on AMD64}
-    TTime    = time_t;
+
+    // TTime    = time_t;    // Not allowed in system unit, -> unixtype
+
     pTime    = ^time_t;
     pTime    = ^time_t;
     ptime_t =  ^time_t;
     ptime_t =  ^time_t;
 
 

+ 1 - 1
rtl/haiku/ptypes.inc

@@ -86,7 +86,7 @@ type
     pClock   = ^clock_t;
     pClock   = ^clock_t;
 
 
     time_t   = clong;           { used for returning the time  }
     time_t   = clong;           { used for returning the time  }
-    TTime    = time_t; 
+    // TTime    = time_t;    // Not allowed in system unit, -> unixtype
     pTime    = ^time_t;
     pTime    = ^time_t;
     ptime_t =  ^time_t;
     ptime_t =  ^time_t;
     
     

+ 2 - 1
rtl/linux/ptypes.inc

@@ -98,7 +98,8 @@ Type
     pSSize    = ^ssize_t;
     pSSize    = ^ssize_t;
     TClock    = clock_t;
     TClock    = clock_t;
     pClock    = ^clock_t;
     pClock    = ^clock_t;
-    TTime     = time_t;
+    // TTime    = time_t;    // Not allowed in system unit, -> unixtype
+
     pTime     = ^time_t;
     pTime     = ^time_t;
     ptime_t   = ^time_t;
     ptime_t   = ^time_t;
 
 

+ 1 - 1
rtl/netbsd/ptypes.inc

@@ -80,7 +80,7 @@ type
     pClock   = ^clock_t;
     pClock   = ^clock_t;
 
 
     time_t   = clong;           { used for returning the time  }
     time_t   = clong;           { used for returning the time  }
-    TTime    = time_t;
+    // TTime    = time_t;    // Not allowed in system unit, -> unixtype
     pTime    = ^time_t;
     pTime    = ^time_t;
     ptime_t  = ^time_t;
     ptime_t  = ^time_t;
 
 

+ 1 - 1
rtl/openbsd/ptypes.inc

@@ -70,7 +70,7 @@ type
     pClock   = ^clock_t;
     pClock   = ^clock_t;
 
 
     time_t   = clong;           { used for returning the time  }
     time_t   = clong;           { used for returning the time  }
-    TTime    = time_t;
+    // TTime    = time_t;    // Not allowed in system unit, -> unixtype
     pTime    = ^time_t;
     pTime    = ^time_t;
     ptime_t  = ^time_t;
     ptime_t  = ^time_t;
 
 

+ 2 - 1
rtl/solaris/ptypes.inc

@@ -93,7 +93,8 @@ Type
     pSSize    = ^ssize_t;
     pSSize    = ^ssize_t;
     TClock    = clock_t;
     TClock    = clock_t;
     pClock    = ^clock_t;
     pClock    = ^clock_t;
-    TTime     = time_t;
+    // TTime    = time_t;    // Not allowed in system unit, -> unixtype
+
     pTime     = ^time_t;
     pTime     = ^time_t;
     ptime_t   = ^time_t;
     ptime_t   = ^time_t;
     clockid_t = cint;
     clockid_t = cint;

+ 2 - 0
rtl/unix/unixtype.pp

@@ -20,6 +20,8 @@ Interface
 
 
 {$i ptypes.inc}
 {$i ptypes.inc}
 
 
+Type
+  TTime = time_t;
 Implementation
 Implementation
 
 
 End.
 End.