Date: Tue, 21 Mar 2017 08:58:00 +0000 (UTC) From: Gleb Smirnoff <glebius@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r436576 - in head/emulators/wine-devel: . files Message-ID: <201703210858.v2L8w0Zr014870@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glebius (src committer) Date: Tue Mar 21 08:58:00 2017 New Revision: 436576 URL: https://svnweb.freebsd.org/changeset/ports/436576 Log: Make it compilable on FreeBSD 12 after struct inpcb and struct tcpcb were stopped being exported. Added: head/emulators/wine-devel/files/patch-dlls_iphlpapi_ipstats.c (contents, props changed) Modified: head/emulators/wine-devel/Makefile Modified: head/emulators/wine-devel/Makefile ============================================================================== --- head/emulators/wine-devel/Makefile Tue Mar 21 08:42:58 2017 (r436575) +++ head/emulators/wine-devel/Makefile Tue Mar 21 08:58:00 2017 (r436576) @@ -3,6 +3,7 @@ PORTNAME= wine DISTVERSION= 2.3 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= SF/${PORTNAME}/Source \ Added: head/emulators/wine-devel/files/patch-dlls_iphlpapi_ipstats.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/wine-devel/files/patch-dlls_iphlpapi_ipstats.c Tue Mar 21 08:58:00 2017 (r436576) @@ -0,0 +1,46 @@ +--- dlls/iphlpapi/ipstats.c.orig 2017-03-03 12:18:32.000000000 -0800 ++++ dlls/iphlpapi/ipstats.c 2017-03-21 00:43:27.101175000 -0700 +@@ -2235,6 +2235,15 @@ + pXIG->xig_len > sizeof (struct xinpgen); + pXIG = (struct xinpgen *)((char *)pXIG + pXIG->xig_len)) + { ++#if __FreeBSD_version >= 1200026 ++ struct xtcpcb *pTCPData; ++ struct xinpcb *pINData; ++ struct xsocket *pSockData; ++ ++ pTCPData = (struct xtcpcb *)pXIG; ++ pINData = &pTCPData->xt_inp; ++ pSockData = &pINData->xi_socket; ++#else + struct tcpcb *pTCPData = NULL; + struct inpcb *pINData; + struct xsocket *pSockData; +@@ -2242,6 +2251,7 @@ + pTCPData = &((struct xtcpcb *)pXIG)->xt_tp; + pINData = &((struct xtcpcb *)pXIG)->xt_inp; + pSockData = &((struct xtcpcb *)pXIG)->xt_socket; ++#endif + + /* Ignore sockets for other protocols */ + if (pSockData->xso_protocol != IPPROTO_TCP) +@@ -2511,11 +2521,19 @@ + pXIG->xig_len > sizeof (struct xinpgen); + pXIG = (struct xinpgen *)((char *)pXIG + pXIG->xig_len)) + { ++#if __FreeBSD_version >= 1200026 ++ struct xinpcb *pINData; ++ struct xsocket *pSockData; ++ ++ pINData = (struct xinpcb *)pXIG; ++ pSockData = &pINData->xi_socket; ++#else + struct inpcb *pINData; + struct xsocket *pSockData; + + pINData = &((struct xinpcb *)pXIG)->xi_inp; + pSockData = &((struct xinpcb *)pXIG)->xi_socket; ++#endif + + /* Ignore sockets for other protocols */ + if (pSockData->xso_protocol != IPPROTO_UDP)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703210858.v2L8w0Zr014870>