Browse Source

* some more socket fixes. unix*/unx* files were manually moved, not svn moved.


git-svn-id: trunk@26431 -

marco 11 years ago
parent
commit
057b07966c

+ 12 - 12
.gitattributes

@@ -6508,9 +6508,17 @@ packages/rtl-extra/Makefile.fpc svneol=native#text/plain
 packages/rtl-extra/Makefile.fpc.fpcmake svneol=native#text/plain
 packages/rtl-extra/fpmake.pp svneol=native#text/plain
 packages/rtl-extra/src/aix/osdefs.inc svneol=native#text/plain
+packages/rtl-extra/src/aix/unxsockh.inc svneol=native#text/plain
 packages/rtl-extra/src/beos/osdefs.inc svneol=native#text/plain
+packages/rtl-extra/src/beos/unixsock.inc svneol=native#text/plain
+packages/rtl-extra/src/beos/unxsockh.inc svneol=native#text/plain
 packages/rtl-extra/src/bsd/osdefs.inc svneol=native#text/plain
+packages/rtl-extra/src/darwin/unxsockh.inc svneol=native#text/plain
+packages/rtl-extra/src/freebsd/unixsock.inc svneol=native#text/plain
+packages/rtl-extra/src/freebsd/unxsockh.inc svneol=native#text/plain
 packages/rtl-extra/src/haiku/osdefs.inc svneol=native#text/plain
+packages/rtl-extra/src/haiku/unixsock.inc svneol=native#text/plain
+packages/rtl-extra/src/haiku/unxsockh.inc svneol=native#text/plain
 packages/rtl-extra/src/inc/matrix.pp svneol=native#text/plain
 packages/rtl-extra/src/inc/mmatimp.inc svneol=native#text/plain
 packages/rtl-extra/src/inc/mvecimp.inc svneol=native#text/plain
@@ -6526,6 +6534,8 @@ packages/rtl-extra/src/linux/unixsockets.inc svneol=native#text/plain
 packages/rtl-extra/src/linux/unixsocketsh.inc svneol=native#text/plain
 packages/rtl-extra/src/linux/unxsockh.inc svneol=native#text/plain
 packages/rtl-extra/src/morphos/sockets.pp svneol=native#text/plain
+packages/rtl-extra/src/netbsd/unixsock.inc svneol=native#text/plain
+packages/rtl-extra/src/netbsd/unxsockh.inc svneol=native#text/plain
 packages/rtl-extra/src/netware/netwsockh.inc svneol=native#text/plain
 packages/rtl-extra/src/netware/sockets.pp svneol=native#text/plain
 packages/rtl-extra/src/netwcomn/qos.inc svneol=native#text/plain
@@ -6533,6 +6543,8 @@ packages/rtl-extra/src/netwcomn/winsock.pp svneol=native#text/plain
 packages/rtl-extra/src/netwlibc/netwsockh.inc svneol=native#text/plain
 packages/rtl-extra/src/netwlibc/sockets.pp svneol=native#text/plain
 packages/rtl-extra/src/openbsd/osdefs.inc svneol=native#text/plain
+packages/rtl-extra/src/openbsd/unixsock.inc svneol=native#text/plain
+packages/rtl-extra/src/openbsd/unxsockh.inc svneol=native#text/plain
 packages/rtl-extra/src/os2commn/sockets.pp svneol=native#text/plain
 packages/rtl-extra/src/os2commn/winsock.pp svneol=native#text/plain
 packages/rtl-extra/src/solaris/osdefs.inc svneol=native#text/plain
@@ -7654,7 +7666,6 @@ rtl/aix/termios.inc svneol=native#text/plain
 rtl/aix/termiosproc.inc svneol=native#text/plain
 rtl/aix/unxconst.inc svneol=native#text/plain
 rtl/aix/unxfunc.inc svneol=native#text/plain
-rtl/aix/unxsockh.inc svneol=native#text/plain
 rtl/amiga/Makefile svneol=native#text/plain
 rtl/amiga/Makefile.fpc svneol=native#text/plain
 rtl/amiga/classes.pp svneol=native#text/plain
@@ -7767,10 +7778,8 @@ rtl/beos/termio.pp svneol=native#text/plain
 rtl/beos/termios.inc svneol=native#text/plain
 rtl/beos/termiosproc.inc svneol=native#text/plain
 rtl/beos/tthread.inc svneol=native#text/plain
-rtl/beos/unixsock.inc svneol=native#text/plain
 rtl/beos/unxconst.inc svneol=native#text/plain
 rtl/beos/unxfunc.inc svneol=native#text/plain
-rtl/beos/unxsockh.inc svneol=native#text/plain
 rtl/bsd/bsd.pas -text svneol=unset#text/plain
 rtl/bsd/bunxfunch.inc svneol=native#text/plain
 rtl/bsd/bunxsysc.inc svneol=native#text/plain
@@ -7843,7 +7852,6 @@ rtl/darwin/termios.inc svneol=native#text/plain
 rtl/darwin/termiosproc.inc svneol=native#text/plain
 rtl/darwin/unxconst.inc svneol=native#text/plain
 rtl/darwin/unxfunc.inc svneol=native#text/plain
-rtl/darwin/unxsockh.inc svneol=native#text/plain
 rtl/darwin/x86/sig_x86.inc svneol=native#text/plain
 rtl/darwin/x86/x86hnd.inc svneol=native#text/plain
 rtl/darwin/x86_64/sig_cpu.inc svneol=native#text/plain
@@ -7943,10 +7951,8 @@ rtl/freebsd/termio.pp svneol=native#text/plain
 rtl/freebsd/termios.inc svneol=native#text/plain
 rtl/freebsd/termiosproc.inc svneol=native#text/plain
 rtl/freebsd/ucontexth.inc svneol=native#text/plain
-rtl/freebsd/unixsock.inc svneol=native#text/plain
 rtl/freebsd/unxconst.inc svneol=native#text/plain
 rtl/freebsd/unxfunc.inc svneol=native#text/plain
-rtl/freebsd/unxsockh.inc svneol=native#text/plain
 rtl/freebsd/unxsysc.inc svneol=native#text/plain
 rtl/freebsd/x86_64/bsyscall.inc svneol=native#text/plain
 rtl/freebsd/x86_64/cprt0.as svneol=native#text/plain
@@ -8040,10 +8046,8 @@ rtl/haiku/system.pp svneol=native#text/plain
 rtl/haiku/termio.pp svneol=native#text/plain
 rtl/haiku/termios.inc svneol=native#text/plain
 rtl/haiku/termiosproc.inc svneol=native#text/plain
-rtl/haiku/unixsock.inc svneol=native#text/plain
 rtl/haiku/unxconst.inc svneol=native#text/plain
 rtl/haiku/unxfunc.inc svneol=native#text/plain
-rtl/haiku/unxsockh.inc svneol=native#text/plain
 rtl/i386/cpu.pp svneol=native#text/plain
 rtl/i386/fastmove.inc svneol=native#text/plain
 rtl/i386/i386.inc svneol=native#text/plain
@@ -8562,10 +8566,8 @@ rtl/netbsd/systypes.inc svneol=native#text/plain
 rtl/netbsd/termio.pp svneol=native#text/plain
 rtl/netbsd/termios.inc svneol=native#text/plain
 rtl/netbsd/termiosproc.inc svneol=native#text/plain
-rtl/netbsd/unixsock.inc svneol=native#text/plain
 rtl/netbsd/unxconst.inc svneol=native#text/plain
 rtl/netbsd/unxfunc.inc svneol=native#text/plain
-rtl/netbsd/unxsockh.inc svneol=native#text/plain
 rtl/netbsd/unxsysc.inc svneol=native#text/plain
 rtl/netbsd/x86_64/bsyscall.inc svneol=native#text/plain
 rtl/netbsd/x86_64/cprt0.as svneol=native#text/plain
@@ -8798,11 +8800,9 @@ rtl/openbsd/systypes.inc svneol=native#text/plain
 rtl/openbsd/termio.pp svneol=native#text/plain
 rtl/openbsd/termios.inc svneol=native#text/plain
 rtl/openbsd/termiosproc.inc svneol=native#text/plain
-rtl/openbsd/unixsock.inc svneol=native#text/plain
 rtl/openbsd/unixsysc.inc svneol=native#text/plain
 rtl/openbsd/unxconst.inc svneol=native#text/plain
 rtl/openbsd/unxfunc.inc svneol=native#text/plain
-rtl/openbsd/unxsockh.inc svneol=native#text/plain
 rtl/openbsd/unxsysc.inc svneol=native#text/plain
 rtl/openbsd/x86_64/bsyscall.inc svneol=native#text/plain
 rtl/openbsd/x86_64/cprt0.as svneol=native#text/plain

+ 5 - 0
packages/rtl-extra/fpmake.pp

@@ -19,6 +19,8 @@ Const
   WinSock2OSes  = [win32,win64,wince];
   // sockets of  morphos is implemented, but not active
   SocketsOSes   = UnixLikes+[netware,netwlibc,os2,wince,win32,win64];
+  Socksyscall   = [beos,freebsd,haiku,linux,netbsd,openbsd];
+  Socklibc	= unixlikes-socksyscall;
   gpmOSes	= [Linux,Android];
   AllTargetsextra = ObjectsOSes + UComplexOSes + MatrixOSes;
 
@@ -82,6 +84,9 @@ begin
        addinclude('socketsh.inc');
        addinclude('sockets.inc');
        addinclude('sockovl.inc');
+       addinclude('unxsockh.inc',UnixLikes);
+       addinclude('stdsock.inc',socklibc);
+       addinclude('unixsock.inc',socksyscall);
      end; 
   end
 end;

+ 0 - 0
rtl/aix/unxsockh.inc → packages/rtl-extra/src/aix/unxsockh.inc


+ 0 - 0
rtl/beos/unixsock.inc → packages/rtl-extra/src/beos/unixsock.inc


+ 0 - 0
rtl/beos/unxsockh.inc → packages/rtl-extra/src/beos/unxsockh.inc


+ 0 - 0
rtl/darwin/unxsockh.inc → packages/rtl-extra/src/darwin/unxsockh.inc


+ 0 - 0
rtl/freebsd/unixsock.inc → packages/rtl-extra/src/freebsd/unixsock.inc


+ 0 - 0
rtl/freebsd/unxsockh.inc → packages/rtl-extra/src/freebsd/unxsockh.inc


+ 0 - 0
rtl/haiku/unixsock.inc → packages/rtl-extra/src/haiku/unixsock.inc


+ 0 - 0
rtl/haiku/unxsockh.inc → packages/rtl-extra/src/haiku/unxsockh.inc


+ 0 - 0
rtl/netbsd/unixsock.inc → packages/rtl-extra/src/netbsd/unixsock.inc


+ 0 - 0
rtl/netbsd/unxsockh.inc → packages/rtl-extra/src/netbsd/unxsockh.inc


+ 0 - 0
rtl/openbsd/unixsock.inc → packages/rtl-extra/src/openbsd/unixsock.inc


+ 0 - 0
rtl/openbsd/unxsockh.inc → packages/rtl-extra/src/openbsd/unxsockh.inc