Use typedef instead of #ifdef
Vladimir Kobal committed
Oct 12, 2017 at 21:18 UTC
1544ade5345f8c72a546749e779cecbeb9ea7f15
1 file changed
+6
-15
src/freebsd_sysctl.c
+6
-15
@@ -79,6 +79,9 @@ struct __vmmeter {
79
u_int v_interrupt_free_min;
80
u_int v_free_severe;
81
};
82
+typedef struct __vmmeter vmmeter_t;
83
+#else
84
+typedef struct vmmeter vmmeter_t;
85
#endif
86
87
// --------------------------------------------------------------------------------------------------------------------
@@ -909,11 +912,7 @@ int do_system_ram(int update_every, usec_t dt) {
912
(void)dt;
913
static int mib_active_count[4] = {0, 0, 0, 0}, mib_inactive_count[4] = {0, 0, 0, 0}, mib_wire_count[4] = {0, 0, 0, 0},
914
mib_cache_count[4] = {0, 0, 0, 0}, mib_vfs_bufspace[2] = {0, 0}, mib_free_count[4] = {0, 0, 0, 0};
912
-#if __FreeBSD_version < 1200029
913
- struct vmmeter vmmeter_data;
914
-#else
915
- struct __vmmeter vmmeter_data;
916
-#endif
915
+ vmmeter_t vmmeter_data;
916
int vfs_bufspace_count;
917
918
if (unlikely(GETSYSCTL_SIMPLE("vm.stats.vm.v_active_count", mib_active_count, vmmeter_data.v_active_count) ||
@@ -980,11 +979,7 @@ int do_system_ram(int update_every, usec_t dt) {
979
int do_vm_stats_sys_v_swappgs(int update_every, usec_t dt) {
980
(void)dt;
981
static int mib_swappgsin[4] = {0, 0, 0, 0}, mib_swappgsout[4] = {0, 0, 0, 0};
983
-#if __FreeBSD_version < 1200029
984
- struct vmmeter vmmeter_data;
985
-#else
986
- struct __vmmeter vmmeter_data;
987
-#endif
982
+ vmmeter_t vmmeter_data;
983
984
if (unlikely(GETSYSCTL_SIMPLE("vm.stats.vm.v_swappgsin", mib_swappgsin, vmmeter_data.v_swappgsin) ||
985
GETSYSCTL_SIMPLE("vm.stats.vm.v_swappgsout", mib_swappgsout, vmmeter_data.v_swappgsout))) {
@@ -1031,11 +1026,7 @@ int do_vm_stats_sys_v_pgfaults(int update_every, usec_t dt) {
1026
(void)dt;
1027
static int mib_vm_faults[4] = {0, 0, 0, 0}, mib_io_faults[4] = {0, 0, 0, 0}, mib_cow_faults[4] = {0, 0, 0, 0},
1028
mib_cow_optim[4] = {0, 0, 0, 0}, mib_intrans[4] = {0, 0, 0, 0};
1034
-#if __FreeBSD_version < 1200029
1035
- struct vmmeter vmmeter_data;
1036
-#else
1037
- struct __vmmeter vmmeter_data;
1038
-#endif
1029
+ vmmeter_t vmmeter_data;
1030
1031
if (unlikely(GETSYSCTL_SIMPLE("vm.stats.vm.v_vm_faults", mib_vm_faults, vmmeter_data.v_vm_faults) ||
1032
GETSYSCTL_SIMPLE("vm.stats.vm.v_io_faults", mib_io_faults, vmmeter_data.v_io_faults) ||