Merged revisions 12175-12176 via svnmerge from

http://svn.freepascal.org/svn/fpc/trunk

........
  r12175 | florian | 2008-11-19 12:36:43 +0100 (Mi, 19 Nov 2008) | 1 line
  
  + more c types
........
  r12176 | florian | 2008-11-19 12:37:18 +0100 (Mi, 19 Nov 2008) | 1 line
  
  * modified zlib patch to resolve 12667 by zipfelvo
........


git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_2_2@12177 3ad0048d-3df7-0310-abae-a5850022a9f2

3 files changed, 11 insertions, 8 deletions

diff --git a/packages/zlib/src/zlib.pp b/packages/zlib/src/zlib.pp
index 3dc170f412..df8268fa4c 100644
--- a/packages/zlib/src/zlib.pp
+++ b/packages/zlib/src/zlib.pp
@@ -11,7 +11,8 @@ interface
 {$ifdef unix}
   {$linklib c}
 {$endif}
-{$PACKRECORDS 4}
+
+{$packrecords c}
 
 uses
   ctypes;
@@ -35,13 +36,12 @@ const
 
 type
   { Compatible with paszlib }
-  Uint    = Longint;
-  Ulong   = Longint;
-  Ulongf  = Longint;
+  Uint    = cuint;
+  Ulong   = culong;
+  Ulongf  = Ulong;
   Pulongf = ^Ulongf;
-  z_off_t = longint;
-  pbyte   = ^byte;
-  pbytef  = ^byte;
+  z_off_t = coff_t;
+  pbytef  = pbyte;
 
   TAllocfunc = function (opaque:pointer; items:uInt; size:uInt):pointer;cdecl;
   TFreeFunc = procedure (opaque:pointer; address:pointer);cdecl;
@@ -62,7 +62,7 @@ type
     zalloc : TAllocFunc;
     zfree : TFreeFunc;
     opaque : pointer;
-    data_type : longint;
+    data_type : cint;
     adler : uLong;
     reserved : uLong;
   end;
diff --git a/rtl/inc/ctypes.pp b/rtl/inc/ctypes.pp
index 462a7ce417..ab4487b123 100644
--- a/rtl/inc/ctypes.pp
+++ b/rtl/inc/ctypes.pp
@@ -78,6 +78,7 @@ type
   u_long  = culong;
   u_short = cushort;
 
+  coff_t = clong;
 {$endif}
 
 implementation
diff --git a/rtl/unix/aliasctp.inc b/rtl/unix/aliasctp.inc
index c74b24a992..7806e11791 100644
--- a/rtl/unix/aliasctp.inc
+++ b/rtl/unix/aliasctp.inc
@@ -52,3 +52,5 @@ type
   cdouble                = UnixType.cdouble;     pcdouble               = UnixType.pcdouble;
   clongdouble            = UnixType.clongdouble; pclongdouble           = UnixType.pclongdouble;
 
+  coff_t                 = UnixType.TOff;
+