From f5d4c3400e2aff33cafe7e650b73e5e77b983990 Mon Sep 17 00:00:00 2001 From: Almindor Date: Fri, 24 Nov 2006 10:12:31 +0000 Subject: [PATCH] * fixes netwares for the new AF_ PF_ git-svn-id: trunk@5466 - --- .gitattributes | 2 ++ rtl/netware/netwsockh.inc | 54 ++++++++++++++++++++++++++++++++++++++ rtl/netware/sockets.pp | 6 +---- rtl/netwlibc/netwsockh.inc | 54 ++++++++++++++++++++++++++++++++++++++ rtl/netwlibc/sockets.pp | 5 +--- 5 files changed, 112 insertions(+), 9 deletions(-) create mode 100644 rtl/netware/netwsockh.inc create mode 100644 rtl/netwlibc/netwsockh.inc diff --git a/.gitattributes b/.gitattributes index b333fa78a9..45ac120310 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4872,6 +4872,7 @@ rtl/netware/mouse.pp svneol=native#text/plain rtl/netware/ndpsrpc.imp -text rtl/netware/netnlm32.imp -text rtl/netware/netware.pp svneol=native#text/plain +rtl/netware/netwsockh.inc svneol=native#text/plain rtl/netware/nit.imp -text rtl/netware/nlmlib.imp -text rtl/netware/npackoff.inc svneol=native#text/plain @@ -4928,6 +4929,7 @@ rtl/netwlibc/libc.pp svneol=native#text/plain rtl/netwlibc/libcclib.imp -text rtl/netwlibc/mouse.pp svneol=native#text/plain rtl/netwlibc/netware.imp -text +rtl/netwlibc/netwsockh.inc svneol=native#text/plain rtl/netwlibc/nwl_dlle.as -text rtl/netwlibc/nwl_main.as -text rtl/netwlibc/nwsnut.imp -text diff --git a/rtl/netware/netwsockh.inc b/rtl/netware/netwsockh.inc new file mode 100644 index 0000000000..55a2c45e50 --- /dev/null +++ b/rtl/netware/netwsockh.inc @@ -0,0 +1,54 @@ +const + AF_UNSPEC = winsock.AF_UNSPEC; + AF_UNIX = winsock.AF_UNIX; + AF_INET = winsock.AF_INET; + AF_IMPLINK = winsock.AF_IMPLINK; + AF_PUP = winsock.AF_PUP; + AF_CHAOS = winsock.AF_CHAOS; + AF_NS = winsock.AF_NS; + AF_IPX = winsock.AF_IPX; + AF_ISO = winsock.AF_ISO; + AF_OSI = winsock.AF_OSI; + AF_ECMA = winsock.AF_ECMA; + AF_DATAKIT = winsock.AF_DATAKIT; + AF_CCITT = winsock.AF_CCITT; + AF_SNA = winsock.AF_SNA; + AF_DECnet = winsock.AF_DECnet; + AF_DLI = winsock.AF_DLI; + AF_LAT = winsock.AF_LAT; + AF_HYLINK = winsock.AF_HYLINK; + AF_APPLETALK = winsock.AF_APPLETALK; + AF_VOICEVIEW = winsock.AF_VOICEVIEW; + AF_FIREFOX = winsock.AF_FIREFOX; + AF_UNKNOWN1 = winsock.AF_UNKNOWN1; + AF_BAN = winsock.AF_BAN; + AF_ATM = winsock.AF_ATM; + AF_INET6 = winsock.AF_INET6; + AF_MAX = winsock.AF_MAX; + + PF_UNSPEC = AF_UNSPEC; + PF_UNIX = AF_UNIX; + PF_INET = AF_INET; + PF_IMPLINK = AF_IMPLINK; + PF_PUP = AF_PUP; + PF_CHAOS = AF_CHAOS; + PF_NS = AF_NS; + PF_IPX = AF_IPX; + PF_ISO = AF_ISO; + PF_OSI = AF_OSI; + PF_ECMA = AF_ECMA; + PF_DATAKIT = AF_DATAKIT; + PF_CCITT = AF_CCITT; + PF_SNA = AF_SNA; + PF_DECnet = AF_DECnet; + PF_DLI = AF_DLI; + PF_LAT = AF_LAT; + PF_HYLINK = AF_HYLINK; + PF_APPLETALK = AF_APPLETALK; + PF_VOICEVIEW = AF_VOICEVIEW; + PF_FIREFOX = AF_FIREFOX; + PF_UNKNOWN1 = AF_UNKNOWN1; + PF_BAN = AF_BAN; + PF_ATM = AF_ATM; + PF_INET6 = AF_INET6; + PF_MAX = AF_MAX; diff --git a/rtl/netware/sockets.pp b/rtl/netware/sockets.pp index 41f00d6d01..e94df17b2b 100644 --- a/rtl/netware/sockets.pp +++ b/rtl/netware/sockets.pp @@ -36,11 +36,7 @@ Type tsocklen=cint; psocklen=^tsocklen; - - Const - AF_MAX = WinSock.AF_MAX; - PF_MAX = AF_MAX; - +{$i netwsockh.inc} {$i socketsh.inc} Implementation diff --git a/rtl/netwlibc/netwsockh.inc b/rtl/netwlibc/netwsockh.inc new file mode 100644 index 0000000000..55a2c45e50 --- /dev/null +++ b/rtl/netwlibc/netwsockh.inc @@ -0,0 +1,54 @@ +const + AF_UNSPEC = winsock.AF_UNSPEC; + AF_UNIX = winsock.AF_UNIX; + AF_INET = winsock.AF_INET; + AF_IMPLINK = winsock.AF_IMPLINK; + AF_PUP = winsock.AF_PUP; + AF_CHAOS = winsock.AF_CHAOS; + AF_NS = winsock.AF_NS; + AF_IPX = winsock.AF_IPX; + AF_ISO = winsock.AF_ISO; + AF_OSI = winsock.AF_OSI; + AF_ECMA = winsock.AF_ECMA; + AF_DATAKIT = winsock.AF_DATAKIT; + AF_CCITT = winsock.AF_CCITT; + AF_SNA = winsock.AF_SNA; + AF_DECnet = winsock.AF_DECnet; + AF_DLI = winsock.AF_DLI; + AF_LAT = winsock.AF_LAT; + AF_HYLINK = winsock.AF_HYLINK; + AF_APPLETALK = winsock.AF_APPLETALK; + AF_VOICEVIEW = winsock.AF_VOICEVIEW; + AF_FIREFOX = winsock.AF_FIREFOX; + AF_UNKNOWN1 = winsock.AF_UNKNOWN1; + AF_BAN = winsock.AF_BAN; + AF_ATM = winsock.AF_ATM; + AF_INET6 = winsock.AF_INET6; + AF_MAX = winsock.AF_MAX; + + PF_UNSPEC = AF_UNSPEC; + PF_UNIX = AF_UNIX; + PF_INET = AF_INET; + PF_IMPLINK = AF_IMPLINK; + PF_PUP = AF_PUP; + PF_CHAOS = AF_CHAOS; + PF_NS = AF_NS; + PF_IPX = AF_IPX; + PF_ISO = AF_ISO; + PF_OSI = AF_OSI; + PF_ECMA = AF_ECMA; + PF_DATAKIT = AF_DATAKIT; + PF_CCITT = AF_CCITT; + PF_SNA = AF_SNA; + PF_DECnet = AF_DECnet; + PF_DLI = AF_DLI; + PF_LAT = AF_LAT; + PF_HYLINK = AF_HYLINK; + PF_APPLETALK = AF_APPLETALK; + PF_VOICEVIEW = AF_VOICEVIEW; + PF_FIREFOX = AF_FIREFOX; + PF_UNKNOWN1 = AF_UNKNOWN1; + PF_BAN = AF_BAN; + PF_ATM = AF_ATM; + PF_INET6 = AF_INET6; + PF_MAX = AF_MAX; diff --git a/rtl/netwlibc/sockets.pp b/rtl/netwlibc/sockets.pp index db7fc0b2f2..2da94f5bf7 100644 --- a/rtl/netwlibc/sockets.pp +++ b/rtl/netwlibc/sockets.pp @@ -36,10 +36,7 @@ Type psocklen=^tsocklen; - Const - AF_MAX = WinSock.AF_MAX; - PF_MAX = AF_MAX; - +{$i netwsockh.inc} {$i socketsh.inc} Implementation