diff options
| author | Jun Kuriyama <kuriyama@FreeBSD.org> | 2002-07-22 05:57:58 +0000 |
|---|---|---|
| committer | Jun Kuriyama <kuriyama@FreeBSD.org> | 2002-07-22 05:57:58 +0000 |
| commit | a05aa886451c1b85fee268a1611e76a65ca5f912 (patch) | |
| tree | e5ec55e0eec07f2f53c6a910734219ab723aa41e /net-mgmt/net-snmp-devel/files/patch-hr_storage.c | |
| parent | Fix build in STABLE and CURRENT, _PATH_CP is defined in system includes (diff) | |
Upgrade to 5.0.2.
Remove statvfs hack.
Notes
Notes:
svn path=/head/; revision=63375
Diffstat (limited to 'net-mgmt/net-snmp-devel/files/patch-hr_storage.c')
| -rw-r--r-- | net-mgmt/net-snmp-devel/files/patch-hr_storage.c | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/net-mgmt/net-snmp-devel/files/patch-hr_storage.c b/net-mgmt/net-snmp-devel/files/patch-hr_storage.c index 3656d5a3a3d1..1e2e66f97e0a 100644 --- a/net-mgmt/net-snmp-devel/files/patch-hr_storage.c +++ b/net-mgmt/net-snmp-devel/files/patch-hr_storage.c @@ -1,6 +1,24 @@ ---- agent/mibgroup/host/hr_storage.c.orig Sat Apr 20 16:30:03 2002 -+++ agent/mibgroup/host/hr_storage.c Wed Apr 24 01:37:29 2002 -@@ -604,7 +604,15 @@ +--- agent/mibgroup/host/hr_storage.c.orig Thu Jul 4 22:00:31 2002 ++++ agent/mibgroup/host/hr_storage.c Mon Jul 22 14:38:58 2002 +@@ -148,7 +148,7 @@ + #define HRFS_mount mnt_mountp + #define HRFS_statfs statvfs + +-#elif defined(HAVE_STATVFS) ++#elif defined(HAVE_STATVFS) && defined(HAVE_MNTENT) + + extern struct mntent *HRFS_entry; + extern int fscount; +@@ -563,7 +563,7 @@ + } + case HRSTORE_UNITS: + if (store_idx < HRS_TYPE_FS_MAX) +-#if STRUCT_STATVFS_HAS_F_FRSIZE ++#if defined(STRUCT_STATVFS_HAS_F_FRSIZE) && defined(HAVE_MNTENT) + long_return = stat_buf.f_frsize; + #else + long_return = stat_buf.f_bsize; +@@ -646,7 +646,15 @@ i++) long_return += mbstat.m_mtypes[i]; #elif defined(MBSTAT_SYMBOL) @@ -16,7 +34,7 @@ #elif defined(NO_DUMMY_VALUES) return NULL; #else -@@ -654,7 +662,15 @@ +@@ -704,7 +712,15 @@ * mbpool.pr_size + (mclpool.pr_nget - mclpool.pr_nput) * mclpool.pr_size; #elif defined(MBSTAT_SYMBOL) |