Merged revisions 788 via svnmerge from

/trunk

git-svn-id: branches/fixes_2_0@869 -
This commit is contained in:
peter 2005-08-16 07:05:34 +00:00
parent 7930e73704
commit cf90eaa79d
2 changed files with 9 additions and 4 deletions

View File

@ -54,7 +54,10 @@ Procedure AddDisk(const path:string);
Implementation
Uses
Strings,Unix,BaseUnix,{$ifdef FPC_USE_LIBC}initc{$ELSE}Syscall{$ENDIF};
UnixUtil, // tzSeconds
Strings,
Unix,
BaseUnix,{$ifdef FPC_USE_LIBC}initc{$ELSE}Syscall{$ENDIF};
{$DEFINE HAS_GETMSCOUNT}

View File

@ -24,9 +24,10 @@ Uses BaseUnix,UnixType;
// We init to zero to be able to put timezone stuff under IFDEF, and still
// keep the code working.
// We can't do this hear, since unixutil functions access this.
var
Tzseconds : Longint = 0;
// var
// Tzseconds : Longint = 0;
{********************
@ -203,7 +204,8 @@ procedure SigRaise (sig:integer);
Implementation
Uses Strings{$ifndef FPC_USE_LIBC},Syscall{$endif};
Uses UnixUtil, // tzseconds
Strings {$ifndef FPC_USE_LIBC},Syscall{$endif};
{$i unxovl.inc}