https://github.com/collectd/collectd/issues/3006 --- old/src/sensors.c +++ new/src/sensors.c @@ -149,7 +149,7 @@ static char *conffile = SENSORS_CONF_PATH; /* #endif SENSORS_API_VERSION < 0x400 */ -#elif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500) +#elif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x600) typedef struct featurelist { const sensors_chip_name *chip; const sensors_feature *feature; @@ -159,9 +159,9 @@ static char *conffile = NULL; static _Bool use_labels = 0; -/* #endif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500) */ +/* #endif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x600) */ -#else /* if SENSORS_API_VERSION >= 0x500 */ +#else /* if SENSORS_API_VERSION >= 0x600 */ #error "This version of libsensors is not supported yet. Please report this " \ "as bug." #endif @@ -223,7 +223,7 @@ if (IS_TRUE(value)) ignorelist_set_invert(sensor_list, 0); } -#if (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500) +#if (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x600) else if (strcasecmp(key, "UseLabels") == 0) { use_labels = IS_TRUE(value) ? 1 : 0; } @@ -353,7 +353,7 @@ } /* while sensors_get_detected_chips */ /* #endif SENSORS_API_VERSION < 0x400 */ -#elif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500) +#elif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x600) chip_num = 0; while ((chip = sensors_get_detected_chips(NULL, &chip_num)) != NULL) { const sensors_feature *feature; @@ -410,7 +410,7 @@ } /* while (subfeature) */ } /* while (feature) */ } /* while (chip) */ -#endif /* (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500) */ +#endif /* (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x600) */ if (first_feature == NULL) { sensors_cleanup(); @@ -485,7 +485,7 @@ } /* for fl = first_feature .. NULL */ /* #endif SENSORS_API_VERSION < 0x400 */ -#elif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500) +#elif (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x600) for (featurelist_t *fl = first_feature; fl != NULL; fl = fl->next) { double value; int status; @@ -528,7 +528,7 @@ sensors_submit(plugin_instance, type, type_instance, value); } /* for fl = first_feature .. NULL */ -#endif /* (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x500) */ +#endif /* (SENSORS_API_VERSION >= 0x400) && (SENSORS_API_VERSION < 0x600) */ return 0; } /* int sensors_read */