svn commit: r441856 - head/devel/libgtop/files

Koop Mast kwm at FreeBSD.org
Sat May 27 16:55:44 UTC 2017


Author: kwm
Date: Sat May 27 16:55:42 2017
New Revision: 441856
URL: https://svnweb.freebsd.org/changeset/ports/441856

Log:
  The ino64 commit to base was in OSVERSION 1200031, so fix the logic bug
  and include this OSVERSION aswell ..
  
  Submitted by:	antoine@
  Pointyhat to:	kwm@

Modified:
  head/devel/libgtop/files/patch-sysdeps_freebsd_procopenfiles.c

Modified: head/devel/libgtop/files/patch-sysdeps_freebsd_procopenfiles.c
==============================================================================
--- head/devel/libgtop/files/patch-sysdeps_freebsd_procopenfiles.c	Sat May 27 16:48:41 2017	(r441855)
+++ head/devel/libgtop/files/patch-sysdeps_freebsd_procopenfiles.c	Sat May 27 16:55:42 2017	(r441856)
@@ -5,7 +5,7 @@
  
  				entry.type = GLIBTOP_FILE_TYPE_LOCALSOCKET;
 +/* 64bit inodes */
-+#if __FreeBSD_version > 1200031
++#if __FreeBSD_version >= 1200031
 +				sun = (struct sockaddr_un *)&kif->kf_un.kf_sock.kf_sa_local;
 +#else
  				sun = (struct sockaddr_un *)&kif->kf_sa_local;
@@ -14,7 +14,7 @@
  				if (sun->sun_path[0]) {
  					char *addrstr;
  
-+#if __FreeBSD_version > 1200031
++#if __FreeBSD_version >= 1200031
 +					addrstr = addr_to_string(&kif->kf_un.kf_sock.kf_sa_local);
 +#else
  					addrstr = addr_to_string(&kif->kf_sa_local);
@@ -26,7 +26,7 @@
  				} else {
  					char *addrstr;
  
-+#if __FreeBSD_version > 1200031
++#if __FreeBSD_version >= 1200031
 +					addrstr = addr_to_string(&kif->kf_un.kf_sock.kf_sa_peer);
 +#else
  					addrstr = addr_to_string(&kif->kf_sa_peer);
@@ -38,7 +38,7 @@
  					entry.type = GLIBTOP_FILE_TYPE_INETSOCKET;
  				else
  					entry.type = GLIBTOP_FILE_TYPE_INET6SOCKET;
-+#if __FreeBSD_version > 1200031
++#if __FreeBSD_version >= 1200031
 +				addrstr = addr_to_string(&kif->kf_un.kf_sock.kf_sa_peer);
 +#else
  				addrstr = addr_to_string(&kif->kf_sa_peer);
@@ -47,7 +47,7 @@
  					  addrstr,
  					  sizeof(entry.info.sock.dest_host));
  				g_free(addrstr);
-+#if __FreeBSD_version > 1200031
++#if __FreeBSD_version >= 1200031
 +				entry.info.sock.dest_port = addr_to_port(&kif->kf_un.kf_sock.kf_sa_peer);
 +#else
  				entry.info.sock.dest_port = addr_to_port(&kif->kf_sa_peer);


More information about the svn-ports-all mailing list