X-Git-Url: http://wpitchoune.net/gitweb/?p=psensor-pkg-debian.git;a=blobdiff_plain;f=src%2Fserver%2Fsysinfo.c;h=a278a3a5dd75d14abee9de6f937b74b46e30fee8;hp=b256b0db459c1efc87edb5bb540bd8ea17478e13;hb=1b39809fbf70fd176646aa2343774bdf04951ee9;hpb=f055e7507526592d3a74c652f5f053701614c9c0

diff --git a/src/server/sysinfo.c b/src/server/sysinfo.c
index b256b0d..a278a3a 100644
--- a/src/server/sysinfo.c
+++ b/src/server/sysinfo.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2012 jeanfi@gmail.com
+ * Copyright (C) 2010-2014 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"
 
@@ -64,7 +70,7 @@ void sysinfo_update(struct psysinfo *info)
 void sysinfo_cleanup()
 {
 	if (cpu)
-		free(cpu);
+		g_free(cpu);
 }
 
 static json_object *ram_to_json_object(const struct psysinfo *s)