diff --git a/src/nut.c b/src/nut.c
index bde5d820168ed97da000993290ee4c4281e50530..f7f026a6299adac2a87d2dc1432789880273c1e2 100644 (file)
--- a/src/nut.c
+++ b/src/nut.c
#include "common.h"
#include "plugin.h"
-#if HAVE_PTHREAD_H
-# include <pthread.h>
-#endif
-
-#if HAVE_UPSCLIENT_H
-# include <upsclient.h>
+#include <pthread.h>
+#include <upsclient.h>
+
+#if HAVE_UPSCONN_T
+typedef UPSCONN_t collectd_upsconn_t;
+#elif HAVE_UPSCONN
+typedef UPSCONN collectd_upsconn_t;
+#else
+# error "Unable to determine the UPS connection type."
#endif
struct nut_ups_s;
typedef struct nut_ups_s nut_ups_t;
struct nut_ups_s
{
- UPSCONN *conn;
+ collectd_upsconn_t *conn;
char *upsname;
char *hostname;
int port;
/* (Re-)Connect if we have no connection */
if (ups->conn == NULL)
{
- ups->conn = (UPSCONN *) malloc (sizeof (UPSCONN));
+ ups->conn = (collectd_upsconn_t *) malloc (sizeof (collectd_upsconn_t));
if (ups->conn == NULL)
{
ERROR ("nut plugin: malloc failed.");