--- Merging r32257 into '.':

U    rtl/inc/systemh.inc
--- Recording mergeinfo for merge of r32257 into '.':
 U   .
--- Merging r32258 into '.':
U    packages/rtl-extra/src/unix/sockets.pp
U    packages/rtl-extra/src/win/sockets.pp
U    packages/rtl-extra/src/os2commn/sockets.pp
--- Recording mergeinfo for merge of r32258 into '.':
 G   .

# revisions: 32257,32258

git-svn-id: branches/fixes_3_0@33389 -

packages/rtl-extra/src/os2commn/sockets.pp

@@ -108,6 +108,7 @@ const
   EsockENOTSOCK = SOCENOTSOCK;
   EsockEPROTONOSUPPORT = SOCEPROTONOSUPPORT;
   EsockEWOULDBLOCK = SOCEWOULDBLOCK;
+  EsockADDRINUSE = SOCEADDRINUSE;
 
 
 (***************************************************************************)

packages/rtl-extra/src/unix/sockets.pp

@@ -59,7 +59,7 @@ const
 {$endif beos}
   EsockEPROTONOSUPPORT  = ESysEProtoNoSupport;
   EsockEWOULDBLOCK      = ESysEWouldBlock;
-
+  EsockADDRINUSE        = ESysEADDRINUSE;
 
 { unix socket specific functions }
 Procedure Str2UnixSockAddr(const addr:string;var t:TUnixSockAddr;var len:longint); deprecated;

packages/rtl-extra/src/win/sockets.pp

@@ -45,6 +45,7 @@ const
   EsockENOTSOCK        = WSAENOTSOCK;
   EsockEPROTONOSUPPORT = WSAEPROTONOSUPPORT;
   EsockEWOULDBLOCK     = WSAEWOULDBLOCK;
+  EsockADDRINUSE       = WSAEADDRINUSE;
 
   SHUT_RD          = SD_RECEIVE; // aliases so we are cross-platform
   SHUT_WR          = SD_SEND;

rtl/inc/systemh.inc

@@ -473,6 +473,7 @@ Type
   PPtrInt             = ^PtrInt;
   PPtrUInt            = ^PtrUInt;
   PSizeInt            = ^SizeInt;
+  PSizeUInt           = ^SizeUInt;
 
   PPByte              = ^PByte;
   PPLongint           = ^PLongint;