Merge tag 'upstream/1.2.0'

[psensor-pkg-debian.git] / src / server / sysinfo.c

diff --git a/src/server/sysinfo.c b/src/server/sysinfo.c
index b256b0d..9c371d5 100644 (file)
--- a/src/server/sysinfo.c
+++ b/src/server/sysinfo.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2012 jeanfi@gmail.com
+ * Copyright (C) 2010-2016 jeanfi@gmail.com
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -21,7 +21,13 @@
 #include <glibtop/netlist.h>
 #include <glibtop/netload.h>
 
+#include "config.h"
+
+#ifdef HAVE_JSON_0
 #include <json/json.h>
+#else
+#include <json-c/json.h>
+#endif
 
 #include "sysinfo.h"
 
@@ -61,10 +67,10 @@ void sysinfo_update(struct psysinfo *info)
                info->interfaces = glibtop_get_netlist(&buf);
 }
 
-void sysinfo_cleanup()
+void sysinfo_cleanup(void)
 {
        if (cpu)
-               free(cpu);
+               g_free(cpu);
 }
 
 static json_object *ram_to_json_object(const struct psysinfo *s)