diff options
author | ivost <ivost@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2008-09-14 18:54:55 +0000 |
---|---|---|
committer | ivost <ivost@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2008-09-14 18:54:55 +0000 |
commit | f02a5078536dfd8e080e58a688e046bbc94725f6 (patch) | |
tree | eaa50004a3a6a4b851d4cdf4acc03e4e8ff2ed24 | |
parent | 26b1c6dd6b558a0577fad9d2bc3bf18a84cf7b6c (diff) | |
download | fpc-f02a5078536dfd8e080e58a688e046bbc94725f6.tar.gz |
* added unixtype unit in addition to baseunix unit (currently baseunix contains all types of unixtype)
git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@11782 3ad0048d-3df7-0310-abae-a5850022a9f2
-rw-r--r-- | packages/fcl-async/src/unix/libasync.pp | 2 | ||||
-rw-r--r-- | packages/fcl-base/src/libtar.pp | 2 | ||||
-rw-r--r-- | packages/fcl-fpcunit/src/digesttestreport.pp | 2 | ||||
-rw-r--r-- | packages/fcl-process/src/process.pp | 2 | ||||
-rw-r--r-- | packages/fv/src/drivers.pas | 2 | ||||
-rw-r--r-- | packages/gtk2/src/gtk2x11/gdk2x.pas | 2 | ||||
-rwxr-xr-x | packages/iconvenc/src/iconvenc.pas | 2 | ||||
-rw-r--r-- | packages/libxml/src/libxml2.pas | 2 | ||||
-rw-r--r-- | packages/pcap/src/pcap.pp | 2 | ||||
-rw-r--r-- | packages/pthreads/src/pthreads.pp | 6 | ||||
-rw-r--r-- | packages/sdl/src/sdl.pas | 1 | ||||
-rw-r--r-- | packages/users/src/grp.pp | 2 | ||||
-rw-r--r-- | packages/users/src/pwd.pp | 2 | ||||
-rw-r--r-- | packages/users/src/users.pp | 2 |
14 files changed, 17 insertions, 14 deletions
diff --git a/packages/fcl-async/src/unix/libasync.pp b/packages/fcl-async/src/unix/libasync.pp index c06518885b..d885ddaa45 100644 --- a/packages/fcl-async/src/unix/libasync.pp +++ b/packages/fcl-async/src/unix/libasync.pp @@ -39,7 +39,7 @@ type implementation -uses baseunix, Unix; +uses unixtype, baseunix, Unix; const MaxHandle = SizeOf(TFDSet) * 8 - 1; diff --git a/packages/fcl-base/src/libtar.pp b/packages/fcl-base/src/libtar.pp index 78f98928dc..37ad12dada 100644 --- a/packages/fcl-base/src/libtar.pp +++ b/packages/fcl-base/src/libtar.pp @@ -95,7 +95,7 @@ USES Libc, // MvdV: Nothing is used from this??? {$ENDIF} {$ifdef Unix} - BaseUnix, Unix, + UnixType, BaseUnix, Unix, {$endif} (*$IFDEF MSWINDOWS *) Windows, diff --git a/packages/fcl-fpcunit/src/digesttestreport.pp b/packages/fcl-fpcunit/src/digesttestreport.pp index 6cf6858bba..91c78bdc72 100644 --- a/packages/fcl-fpcunit/src/digesttestreport.pp +++ b/packages/fcl-fpcunit/src/digesttestreport.pp @@ -108,7 +108,7 @@ implementation uses LibTar, {$IFDEF UNIX} - Unix,BaseUnix, + UnixType,Unix,BaseUnix, {$ENDIF} {$IFDEF MSWINDOWS} windows, diff --git a/packages/fcl-process/src/process.pp b/packages/fcl-process/src/process.pp index ca5186de7a..10f94ba811 100644 --- a/packages/fcl-process/src/process.pp +++ b/packages/fcl-process/src/process.pp @@ -145,6 +145,8 @@ Uses {$endif WINDOWS} {$ifdef UNIX} uses + ctypes, + UnixType, Unix, Baseunix; {$endif UNIX} diff --git a/packages/fv/src/drivers.pas b/packages/fv/src/drivers.pas index 4a385b4d43..30f8e8c65d 100644 --- a/packages/fv/src/drivers.pas +++ b/packages/fv/src/drivers.pas @@ -86,7 +86,7 @@ USES {$ifdef VER1_0} linux, {$else} - baseunix,unix, + unixtype,baseunix,unix, {$endif} {$ENDIF} diff --git a/packages/gtk2/src/gtk2x11/gdk2x.pas b/packages/gtk2/src/gtk2x11/gdk2x.pas index 0ea598658a..cb9733a057 100644 --- a/packages/gtk2/src/gtk2x11/gdk2x.pas +++ b/packages/gtk2/src/gtk2x11/gdk2x.pas @@ -25,7 +25,7 @@ unit gdk2x; interface uses - Classes, SysUtils, Unix, BaseUnix, glib2, gdk2, XLib, X, XRender; + Classes, SysUtils, UnixType, Unix, BaseUnix, glib2, gdk2, XLib, X, XRender; {$ifdef FREEBSD} {$linklib pthread} diff --git a/packages/iconvenc/src/iconvenc.pas b/packages/iconvenc/src/iconvenc.pas index 11c144c85e..a1b0c337b9 100755 --- a/packages/iconvenc/src/iconvenc.pas +++ b/packages/iconvenc/src/iconvenc.pas @@ -22,7 +22,7 @@ interface {DEFINE LOADDYNAMIC} uses - baseunix, + ctypes,unixtype,baseunix, {$ifdef LOADDYNAMIC} dl, {$endif} diff --git a/packages/libxml/src/libxml2.pas b/packages/libxml/src/libxml2.pas index 84cdb09b62..841d69fac1 100644 --- a/packages/libxml/src/libxml2.pas +++ b/packages/libxml/src/libxml2.pas @@ -14,7 +14,7 @@ uses windows, {$ENDIF} {$IFDEF UNIX} - baseunix, + unixtype, {$ENDIF} ctypes; diff --git a/packages/pcap/src/pcap.pp b/packages/pcap/src/pcap.pp index 05ee12ca9b..d207dbc2ee 100644 --- a/packages/pcap/src/pcap.pp +++ b/packages/pcap/src/pcap.pp @@ -41,7 +41,7 @@ interface uses {$ifdef UNIX} - BaseUnix, + UnixType,BaseUnix, {$endif} {$ifdef Windows} WinSock, Windows, diff --git a/packages/pthreads/src/pthreads.pp b/packages/pthreads/src/pthreads.pp index 008bbd1258..11c107af3b 100644 --- a/packages/pthreads/src/pthreads.pp +++ b/packages/pthreads/src/pthreads.pp @@ -25,16 +25,16 @@ uses initc,BaseUnix, unixtype; {$i pthrbsd.inc} {$else} {$ifdef linux} - uses initc,unixtype; + uses initc, ctypes, unixtype; {$i pthrlinux.inc} {$else} {$ifdef sunos} - uses initc,unixtype; + uses initc, ctypes, unixtype; {$i pthrsnos.inc} {$else} {$ifdef beos} - uses initc, baseunix, unixtype; + uses initc, ctypes, baseunix, unixtype; {$i pthrbeos.inc} {$else} {$error operating system not detected} diff --git a/packages/sdl/src/sdl.pas b/packages/sdl/src/sdl.pas index 514ea49a60..965a51311e 100644 --- a/packages/sdl/src/sdl.pas +++ b/packages/sdl/src/sdl.pas @@ -300,6 +300,7 @@ uses {$IFDEF UNIX} {$IFDEF FPC} pthreads, + unixtype, baseunix, {$IFNDEF GP2X} unix, diff --git a/packages/users/src/grp.pp b/packages/users/src/grp.pp index e81e658321..21925df059 100644 --- a/packages/users/src/grp.pp +++ b/packages/users/src/grp.pp @@ -3,7 +3,7 @@ unit grp; interface uses - initc,baseunix,ctypes; + initc,unixtype,baseunix,ctypes; {$IFDEF FPC} {$PACKRECORDS C} diff --git a/packages/users/src/pwd.pp b/packages/users/src/pwd.pp index e5757d82a3..5a961fc008 100644 --- a/packages/users/src/pwd.pp +++ b/packages/users/src/pwd.pp @@ -3,7 +3,7 @@ unit pwd; interface uses - initc,baseunix,ctypes; + initc,unixtype,baseunix,ctypes; {$IFDEF FPC} {$PACKRECORDS C} diff --git a/packages/users/src/users.pp b/packages/users/src/users.pp index 0e944eedd9..2184d23149 100644 --- a/packages/users/src/users.pp +++ b/packages/users/src/users.pp @@ -2,7 +2,7 @@ unit users; Interface {$mode delphi} -uses BaseUnix,pwd,grp, {$ifdef Linux} shadow,{$endif}SysUtils,Classes; +uses UnixType,BaseUnix,pwd,grp, {$ifdef Linux} shadow,{$endif}SysUtils,Classes; Type EUserLookupError = Class(Exception); |